[Xfce4-commits] r26642 - xfce-utils/trunk/xfrun
Author: kelnos
Date: 2008-02-26 09:31:40 + (Tue, 26 Feb 2008)
New Revision: 26642
Modified:
xfce-utils/trunk/xfrun/xfrun-dialog.c
Log:
use real GtkComboBoxEntry instead of separate GtkEntry and GtkButton, patch
from Stefan Stuhr (bug 3820)
Modified: xfce-utils/trunk/xfrun/xfrun-dialog.c
===
--- xfce-utils/trunk/xfrun/xfrun-dialog.c 2008-02-26 09:24:12 UTC (rev
26641)
+++ xfce-utils/trunk/xfrun/xfrun-dialog.c 2008-02-26 09:31:40 UTC (rev
26642)
@@ -2,17 +2,18 @@
* xfrun - a simple quick run dialog with saved history and completion
*
* Copyright (c) 2006 Brian J. Tarricone [EMAIL PROTECTED]
+ * Copyright (c) 2008 Stefan Stuhr [EMAIL PROTECTED]
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -44,8 +45,8 @@
struct _XfrunDialogPrivate
{
+GtkWidget *comboboxentry;
GtkWidget *entry;
-GtkWidget *arrow_btn;
GtkWidget *terminal_chk;
GtkTreeModel *completion_model;
@@ -94,6 +95,8 @@
static gboolean xfrun_dialog_delete_event(GtkWidget *widget,
GdkEventAny *evt);
+static gboolean xfrun_comboboxentry_changed(GtkComboBoxEntry *comboboxentry,
+gpointer user_data);
static gboolean xfrun_entry_check_match(GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
@@ -101,11 +104,6 @@
static gboolean xfrun_entry_focus_out(GtkWidget *widget,
GdkEventFocus *evt,
gpointer user_data);
-static gboolean xfrun_entry_key_press(GtkWidget *widget,
- GdkEventKey *evt,
- gpointer user_data);
-static void xfrun_menu_button_clicked(GtkWidget *widget,
- gpointer user_data);
static void xfrun_run_clicked(GtkWidget *widget,
gpointer user_data);
static gboolean xfrun_match_selected(GtkEntryCompletion *completion,
@@ -162,9 +160,8 @@
static void
xfrun_dialog_init(XfrunDialog *dialog)
{
-GtkWidget *entry, *chk, *btn, *vbox, *bbox, *hbox, *arrow;
+GtkWidget *entry, *comboboxentry, *chk, *btn, *vbox, *bbox;
GtkTreeIter itr;
-gchar *first_item = NULL;
dialog-priv = G_TYPE_INSTANCE_GET_PRIVATE(dialog, XFRUN_TYPE_DIALOG,
XfrunDialogPrivate);
@@ -177,46 +174,26 @@
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
-hbox = gtk_hbox_new(FALSE, BORDER/4);
-gtk_widget_show(hbox);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-
-dialog-priv-entry = entry = gtk_entry_new();
+dialog-priv-comboboxentry = comboboxentry = gtk_combo_box_entry_new();
+dialog-priv-entry = entry = gtk_bin_get_child(GTK_BIN(comboboxentry));
gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
xfrun_setup_entry_completion(dialog);
-gtk_widget_show(entry);
-gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+gtk_widget_show(comboboxentry);
+gtk_box_pack_start(GTK_BOX(vbox), comboboxentry, FALSE, FALSE, 0);
+g_signal_connect(G_OBJECT(comboboxentry), changed,
+ G_CALLBACK(xfrun_comboboxentry_changed), dialog);
g_signal_connect(G_OBJECT(entry), focus-out-event,
G_CALLBACK(xfrun_entry_focus_out), dialog);
-g_signal_connect(G_OBJECT(entry), key-press-event,
- G_CALLBACK(xfrun_entry_key_press), dialog);
-if(gtk_tree_model_get_iter_first(dialog-priv-completion_model, itr)) {
-gtk_tree_model_get(dialog-priv-completion_model, itr,
- XFRUN_COL_COMMAND, first_item,
- -1);
-if(first_item) {
-gtk_entry_set_text(GTK_ENTRY(entry), first_item);
-g_free(first_item);
-}
-}
-
-dialog-priv-arrow_btn = btn = gtk_button_new();
-gtk_container_set_border_width(GTK_CONTAINER(btn), 0);
-gtk_widget_show(btn);
-gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0);
-g_signal_connect(G_OBJECT(btn),
[Xfce4-commits] r26643 - in xfcalendar/trunk: . panel-plugin
Author: juha
Date: 2008-02-26 14:24:13 + (Tue, 26 Feb 2008)
New Revision: 26643
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/panel-plugin/oc_config.c
Log:
Partial fix of Bug 3876
Changed default timezone selection directory to be /usr/share/zoneinfo
instead of old /usr/local/etc/zoneinfo which is not much in use anymore.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-26 09:31:40 UTC (rev 26642)
+++ xfcalendar/trunk/configure.in.in2008-02-26 14:24:13 UTC (rev 26643)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.9-svn])
+m4_define([orage_version], [4.5.12.10-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/panel-plugin/oc_config.c
===
--- xfcalendar/trunk/panel-plugin/oc_config.c 2008-02-26 09:31:40 UTC (rev
26642)
+++ xfcalendar/trunk/panel-plugin/oc_config.c 2008-02-26 14:24:13 UTC (rev
26643)
@@ -117,9 +117,9 @@
, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
/* let's try to start on few standard positions */
if (gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/local/etc/zoneinfo/GMT) == FALSE)
+, /usr/share/zoneinfo/GMT) == FALSE)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/share/zoneinfo/GMT);
+, /usr/lib/zoneinfo/GMT);
if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_entry_set_text(GTK_ENTRY(clock-tz_entry), filename);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26644 - xfcalendar/trunk/doc/C
Author: juha Date: 2008-02-26 15:16:10 + (Tue, 26 Feb 2008) New Revision: 26644 Modified: xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml Log: added info for new file location Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2008-02-26 14:24:13 UTC (rev 26643) +++ xfcalendar/trunk/doc/C/orage.html 2008-02-26 15:16:10 UTC (rev 26644) @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.68.1link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.12. +htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.72.0link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.12. Last updated: January 2008 br/br/span/divdivp class=copyrightCopyright � 2006-2008 Juha Kautto/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=sect1a href=#orage-introIntroduction/a/span/dtdtspan class=sect1a href=#orage-getting-startedGetting started/a/span/dtdtspan class=sect1a href=#orage-calendar-windowThe calendar window/a/span/dtdddldtspan class=sect2a href=#calendar-menu-barThe menu bar/a/span/dtdtspan class=sect2a href=#calendar-windowThe calendar/a/span/dtdtspan class=sect2a href=#calendar-todo-windowThe TODO list/a/span/dt/dl/dddtspan class=sect1a href=#orage-eventlist-windowThe event list window/a/span/dtdddldtspan class=sect2a href=#event%20list-action-barThe button bar/a/span/dtdtspan class=sect2a href=#eventlist-tabsThe tabs/a/span/dtdtspan class=sect2a href=#eventlist- appointmentsThe appointment list/a/span/dt/dl/dddtspan class=sect1a href=#orage-daylist-windowThe day list window/a/span/dtdddldtspan class=sect2a href=#daylist-action-barThe button bar/a/span/dtdtspan class=sect2a href=#daylist-parametersThe parameters/a/span/dtdtspan class=sect2a href=#daylist-listThe day list/a/span/dt/dl/dddtspan class=sect1a href=#orage-appointment-windowThe appointment window/a/span/dtdddldtspan class=sect2a href=#appointment-action-barThe button bar/a/span/dtdtspan class=sect2a href=#appointment-general-tabThe general tab/a/span/dtdtspan class=sect2a href=#appointment-alarm-tabThe alarm tab/a/span/dtdtspan class=sect2a href=#appointment-recurrence-tabThe recurrence tab/a/span/dt/dl/dddtspan class=sect1a href=#orage-exchangedata-windowThe exchange data window/a/span/dt dddldtspan class=sect2a href=#exchange-impexp-tabThe import export tab/a/span/dtdtspan class=sect2a href=#exchange-oragefiles-tabThe orage files
