projects / dana / obconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4b48c1)
update the interface, clean up the theme buttons
authorDana Jansens <danakj@orodu.net>
Wed, 30 May 2007 01:26:37 +0000 (01:26 +0000)
committerDana Jansens <danakj@orodu.net>
Wed, 30 May 2007 01:26:37 +0000 (01:26 +0000)
src/obconf.glade patch | blob | history
src/strings.c patch | blob | history

diff --git a/src/obconf.glade b/src/obconf.glade
index 825a3afdaa59739ef0a65c9d20767308d340920d..d49ad4a2039f879a488383bf272970e73ceeef75 100644 (file)
--- a/src/obconf.glade
+++ b/src/obconf.glade
@@ -170,144 +170,81 @@
                  <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label102">
+                   <widget class="GtkButton" id="install_theme">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Install a New Theme&lt;/span&gt;</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">True</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox52">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" handler="on_install_theme_clicked" last_modification_time="Tue, 29 May 2007 21:35:26 GMT"/>
 
                      <child>
-                       <widget class="GtkLabel" id="label101">
+                       <widget class="GtkAlignment" id="alignment1">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">    </property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
+                         <property name="xalign">0</property>
                          <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkButton" id="install_theme">
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <signal name="clicked" handler="on_install_theme_clicked" last_modification_time="Tue, 29 May 2007 21:35:26 GMT"/>
+                         <property name="xscale">0</property>
+                         <property name="yscale">0</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
 
                          <child>
-                           <widget class="GtkAlignment" id="alignment1">
+                           <widget class="GtkHBox" id="hbox53">
                              <property name="visible">True</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-                             <property name="top_padding">0</property>
-                             <property name="bottom_padding">0</property>
-                             <property name="left_padding">0</property>
-                             <property name="right_padding">0</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox53">
+                               <widget class="GtkImage" id="image1">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image1">
-                                     <property name="visible">True</property>
-                                     <property name="stock">gtk-open</property>
-                                     <property name="icon_size">4</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
+                                 <property name="stock">gtk-open</property>
+                                 <property name="icon_size">4</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
 
-                                 <child>
-                                   <widget class="GtkLabel" id="label103">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Choose a theme to _install...</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
+                             <child>
+                               <widget class="GtkLabel" id="label103">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">_Install a new theme...</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
                                </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
                              </child>
                            </widget>
                          </child>
                        </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
                      </child>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
                </widget>
@@ -325,144 +262,81 @@
                  <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label104">
+                   <widget class="GtkButton" id="theme_archive">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Create a Theme Archive&lt;/span&gt;</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">True</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox54">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" handler="on_theme_archive_clicked" last_modification_time="Wed, 30 May 2007 00:08:47 GMT"/>
 
                      <child>
-                       <widget class="GtkLabel" id="label105">
+                       <widget class="GtkAlignment" id="alignment2">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">    </property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
+                         <property name="xalign">0</property>
                          <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkButton" id="theme_archive">
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <signal name="clicked" handler="on_theme_archive_clicked" last_modification_time="Wed, 30 May 2007 00:08:47 GMT"/>
+                         <property name="xscale">0</property>
+                         <property name="yscale">0</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
 
                          <child>
-                           <widget class="GtkAlignment" id="alignment2">
+                           <widget class="GtkHBox" id="hbox55">
                              <property name="visible">True</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-                             <property name="top_padding">0</property>
-                             <property name="bottom_padding">0</property>
-                             <property name="left_padding">0</property>
-                             <property name="right_padding">0</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox55">
+                               <widget class="GtkImage" id="image2">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image2">
-                                     <property name="visible">True</property>
-                                     <property name="stock">gtk-open</property>
-                                     <property name="icon_size">4</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
+                                 <property name="stock">gtk-save</property>
+                                 <property name="icon_size">4</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
 
-                                 <child>
-                                   <widget class="GtkLabel" id="label106">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Choose a theme to _archive...</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
+                             <child>
+                               <widget class="GtkLabel" id="label106">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">_Create a theme archive (.obt)...</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
                                </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
                              </child>
                            </widget>
                          </child>
                        </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
                      </child>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
                </widget>
diff --git a/src/strings.c b/src/strings.c
index 77f66c50fc637fbc7773c108e720588c6bbb3e02..c78a87c60bbade2861160f33acacd841369d2595 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -7,12 +7,8 @@
 gchar *s = N_("Openbox Window Preferences");
 gchar *s = N_("<span weight=\"bold\">Theme</span>");
 gchar *s = N_("    ");
-gchar *s = N_("<span weight=\"bold\">Install a New Theme</span>");
-gchar *s = N_("    ");
-gchar *s = N_("Choose a theme to _install...");
-gchar *s = N_("<span weight=\"bold\">Create a Theme Archive</span>");
-gchar *s = N_("    ");
-gchar *s = N_("Choose a theme to _archive...");
+gchar *s = N_("_Install a new theme...");
+gchar *s = N_("_Create a theme archive (.obt)...");
 gchar *s = N_("Theme");
 gchar *s = N_("<span weight=\"bold\">Windows</span>");
 gchar *s = N_("    ");
Openbox Configuration Manager