[Xfce4-commits] <orage:master> 4.7.4.7 claried window headers and menu names. Also made alarm window selectable.

Juha Kautto noreply at xfce.org
Mon Oct 5 15:10:01 CEST 2009


Updating branch refs/heads/master
         to ffd1677e2cd932759bea065a120484b42ffda664 (commit)
       from 1b1ae3db8ff86378f647ef174a62161a36d2de10 (commit)

commit ffd1677e2cd932759bea065a120484b42ffda664
Author: Juha Kautto <juha at xfce.org>
Date:   Mon Oct 5 15:50:41 2009 +0300

    4.7.4.7 claried window headers and menu names. Also made alarm window selectable.
    
    Modified desktop files to have same style and more data. Instead of only Orage
    they now say Orage Calendar.
    Made text and header of alarm window selectable so that cut/paste works now.

 configure.in.in                            |    2 +-
 globaltime/globaltime.desktop.in           |    4 ++--
 globaltime/gt_prefs.c                      |    4 ++--
 panel-plugin/oc_config.c                   |    4 ++--
 panel-plugin/xfce4-orageclock-plugin.c     |    5 -----
 plugin/xfce-xfcalendar-settings.desktop.in |    2 +-
 src/reminder.c                             |    2 ++
 xfcalendar.desktop.in                      |    2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9fe9134..3862f08 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.4.7-test])
+m4_define([orage_version], [4.7.4.8-test])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/globaltime.desktop.in b/globaltime/globaltime.desktop.in
index 27942ee..a42d480 100644
--- a/globaltime/globaltime.desktop.in
+++ b/globaltime/globaltime.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-_Name=Globaltime
+_Name=Orage Globaltime
 _Comment=Show clocks from different countries
 Exec=globaltime
 Icon=xfce4-clock
@@ -9,4 +9,4 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Categories=X-XFCE;Office;Clock;GTK;Application;Utility;
-_GenericName=Clock
+_GenericName=Globaltime
diff --git a/globaltime/gt_prefs.c b/globaltime/gt_prefs.c
index 166c846..b9b3cf2 100644
--- a/globaltime/gt_prefs.c
+++ b/globaltime/gt_prefs.c
@@ -585,7 +585,7 @@ gboolean clock_parameters(GtkWidget *widget, clock_struct *clockp)
     modify_clock->clock = clockp;
     clockp->modify_data = modify_clock;
     modify_clock->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    window_name = g_strconcat(_("Modify Clock "), clockp->name->str, NULL);
+    window_name = g_strconcat(_("Globaltime preferences "), clockp->name->str, NULL);
     gtk_window_set_title(GTK_WINDOW(modify_clock->window), window_name);
     g_free(window_name);
     g_signal_connect(G_OBJECT(modify_clock->window) , "destroy"
@@ -1057,7 +1057,7 @@ gboolean default_preferences(GtkWidget *widget)
     modify_default = g_new0(modify_struct, 1);
     modify_default->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW (modify_default->window)
-            , _("Modify Globaltime Preferences"));
+            , _("Globaltime Preferences"));
     g_signal_connect(G_OBJECT(modify_default->window) , "destroy"
             , G_CALLBACK(release_preferences_window), modify_default);
                                                                                 
diff --git a/panel-plugin/oc_config.c b/panel-plugin/oc_config.c
index 38da945..d6a74cb 100644
--- a/panel-plugin/oc_config.c
+++ b/panel-plugin/oc_config.c
@@ -135,7 +135,7 @@ static void oc_show3(GtkToggleButton *cb, Clock *clock)
 static void oc_hib_timing_toggled(GtkToggleButton *cb, Clock *clock)
 {
     clock->hib_timing = gtk_toggle_button_get_active(cb);
-    oc_hib_timing_set(clock);
+    /* oc_hib_timing_set(clock); */
 }
 
 static gboolean oc_line_changed(GtkWidget *entry, GdkEventKey *key
@@ -404,7 +404,7 @@ void oc_properties_dialog(XfcePanelPlugin *plugin, Clock *clock)
     clock->interval = 200; /* 0,2 sec, so that we can show quick feedback
                             * on the panel */
     oc_start_timer(clock);
-    dlg = gtk_dialog_new_with_buttons(_("Properties"), 
+    dlg = gtk_dialog_new_with_buttons(_("Orage clock Preferences"), 
             GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))),
             GTK_DIALOG_DESTROY_WITH_PARENT |
             GTK_DIALOG_NO_SEPARATOR,
diff --git a/panel-plugin/xfce4-orageclock-plugin.c b/panel-plugin/xfce4-orageclock-plugin.c
index de6b684..4ca643f 100644
--- a/panel-plugin/xfce4-orageclock-plugin.c
+++ b/panel-plugin/xfce4-orageclock-plugin.c
@@ -548,7 +548,6 @@ void oc_write_rc_file(XfcePanelPlugin *plugin, Clock *clock)
 }
 
 /* Create widgets and connect to signals */
-
 Clock *orage_oc_new(XfcePanelPlugin *plugin)
 {
     Clock *clock = g_new0(Clock, 1);
@@ -616,10 +615,6 @@ void oc_show_frame_set(Clock *clock)
             , clock->show_frame ? GTK_SHADOW_IN : GTK_SHADOW_NONE);
 }
 
-void oc_hib_timing_set(Clock *clock)
-{
-}
-
 void oc_fg_set(Clock *clock)
 {
     GdkColor *fg = NULL;
diff --git a/plugin/xfce-xfcalendar-settings.desktop.in b/plugin/xfce-xfcalendar-settings.desktop.in
index 0da4834..211985e 100644
--- a/plugin/xfce-xfcalendar-settings.desktop.in
+++ b/plugin/xfce-xfcalendar-settings.desktop.in
@@ -9,5 +9,5 @@ Terminal=false
 Type=Application
 Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
 OnlyShowIn=XFCE;
-_GenericName=Calendar Settings
+_GenericName=Orage Calendar Preferences
 _X-XfceSettingsName=Calendar
diff --git a/src/reminder.c b/src/reminder.c
index 13b9edc..f265968 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -536,6 +536,7 @@ static void create_orage_reminder(alarm_struct *alarm)
     vbReminder = GTK_DIALOG(wReminder)->vbox;
 
     hdReminder = gtk_label_new(alarm->title);
+    gtk_label_set_selectable(GTK_LABEL(hdReminder), TRUE);
     gtk_box_pack_start(GTK_BOX(vbReminder), hdReminder, FALSE, TRUE, 0);
 
     swReminder = gtk_scrolled_window_new(NULL, NULL);
@@ -547,6 +548,7 @@ static void create_orage_reminder(alarm_struct *alarm)
 
     lbReminder = gtk_label_new(alarm->description);
     gtk_label_set_line_wrap(GTK_LABEL(lbReminder), TRUE);
+    gtk_label_set_selectable(GTK_LABEL(lbReminder), TRUE);
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swReminder)
             , lbReminder);
 
diff --git a/xfcalendar.desktop.in b/xfcalendar.desktop.in
index 6cc1053..023920a 100644
--- a/xfcalendar.desktop.in
+++ b/xfcalendar.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-_Name=Orage
+_Name=Orage Calendar
 _Comment=Desktop calendar
 Exec=orage
 Icon=xfcalendar



More information about the Xfce4-commits mailing list