← Back to branch summary

~cairo-dock-team/ubuntu/natty/cairo-dock/2.3.0-2.1

« back to all changes in this revision

Viewing changes to src/cairo-dock-gui-main.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907203125-tkq6wc8rw0flx5se
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632055
https://launchpad.net/bugs/618336
https://launchpad.net/bugs/614686
https://launchpad.net/bugs/612617
https://launchpad.net/bugs/612355
https://launchpad.net/bugs/611733
* New Upstream Version (LP: #632055)
* Fixed a few bugs on LP:
 - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0
 - LP: #614686 create new sud-dock icon that looking like flat
 - LP: #612617 Add custom launchers or sub-docks, can't modify name.
 - LP: #612355 Add option in config file to set GL/Cairo mode            
 - LP: #611733 icon labels go off-screen
* Fixed a crash when changing theme or gauges
* Updated translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-dock-gui-main.c
58
58
#define CAIRO_DOCK_PREVIEW_HEIGHT 250
59
59
#define CAIRO_DOCK_ICON_MARGIN 6
60
60
#define CAIRO_DOCK_TAB_ICON_SIZE 32
 
61
#define CAIRO_DOCK_THEME_SERVER "http://themes.glx-dock.org"
61
62
 
62
63
extern CairoDockDesktopGeometry g_desktopGeometry;
63
64
extern gboolean g_bEnterHelpOnce;
 
65
extern int g_iMajorVersion, g_iMinorVersion, g_iMicroVersion;
64
66
 
65
67
struct _CairoDockCategoryWidgetTable {
66
68
        GtkWidget *pFrame;
1160
1162
        bHideOther = gtk_check_menu_item_get_active (pMenuItem);
1161
1163
        _trigger_current_filter ();
1162
1164
}
1163
 
///static void on_clear_filter (GtkButton *pButton, GtkEntry *pEntry)
 
1165
#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
1164
1166
static void on_clear_filter (GtkEntry *pEntry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer data)
1165
1167
{
1166
1168
        gtk_entry_set_text (pEntry, "");
1170
1172
        const gchar *keyword[2] = {"fabounetfabounetfabounet", NULL};
1171
1173
        cairo_dock_apply_current_filter ((gchar **)keyword, FALSE, FALSE, FALSE, FALSE);
1172
1174
}
 
1175
#endif
1173
1176
 
1174
1177
 
1175
1178
  ////////////
1663
1666
                FALSE,
1664
1667
                0);
1665
1668
        
 
1669
        #if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
1666
1670
        gtk_entry_set_icon_activatable (GTK_ENTRY (s_pFilterEntry), GTK_ENTRY_ICON_SECONDARY, TRUE);
1667
1671
        gtk_entry_set_icon_from_stock (GTK_ENTRY (s_pFilterEntry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
1668
1672
        g_signal_connect (s_pFilterEntry, "icon-press", G_CALLBACK (on_clear_filter), NULL);
 
1673
        #endif
1669
1674
        
1670
1675
        // options
1671
1676
        _reset_filter_state ();
1772
1777
                FALSE,
1773
1778
                0);
1774
1779
        
 
1780
        gchar *cAdress = g_strdup_printf (CAIRO_DOCK_THEME_SERVER"/third-party/%d.%d.%d", g_iMajorVersion, g_iMinorVersion, g_iMicroVersion);
 
1781
        GtkWidget *pThirdPartyButton = gtk_link_button_new_with_label (cAdress, _("More applets"));
 
1782
        gtk_widget_set_tooltip_text (pThirdPartyButton, _("Get more applets online !"));
 
1783
        pImage = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
 
1784
        gtk_button_set_image (GTK_BUTTON (pThirdPartyButton), pImage);
 
1785
        g_free (cAdress);
 
1786
        gtk_box_pack_start (GTK_BOX (pButtonsHBox),
 
1787
                pThirdPartyButton,
 
1788
                FALSE,
 
1789
                FALSE,
 
1790
                0);
 
1791
        
1775
1792
        //\_____________ On ajoute la barre de status a la fin.
1776
1793
        s_pStatusBar = gtk_statusbar_new ();
1777
1794
        gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (s_pStatusBar), FALSE);