[anjuta] file-wizard: Cosmetic improvements of new file dialog



commit cdc7b0e48fa35605d61336deac1e37cc853a252a
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Mon Jan 9 19:26:18 2012 +0100

    file-wizard: Cosmetic improvements of new file dialog

 plugins/file-wizard/anjuta-file-wizard.ui |  103 +++++++++++++----------------
 plugins/file-wizard/file.c                |    4 -
 2 files changed, 46 insertions(+), 61 deletions(-)
---
diff --git a/plugins/file-wizard/anjuta-file-wizard.ui b/plugins/file-wizard/anjuta-file-wizard.ui
index 02a8340..8888caa 100644
--- a/plugins/file-wizard/anjuta-file-wizard.ui
+++ b/plugins/file-wizard/anjuta-file-wizard.ui
@@ -2,6 +2,12 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires anjuta 0.0 -->
+  <object class="GtkListStore" id="new.file.menu.license.store">
+    <columns>
+      <!-- column-name license -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="dialog.new.file">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -259,13 +265,14 @@ The extension will be added according to the type.</property>
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="new.file.license">
-                            <property name="label" translatable="yes">Add License Information</property>
+                            <property name="label" translatable="yes">Add License Information:</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="on_new_file_license_toggled" swapped="no"/>
                           </object>
@@ -275,42 +282,6 @@ The extension will be added according to the type.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label12344">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">License:</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="new.file.menu.license">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="model">new.file.menu.license.store</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkCheckButton" id="new.file.header">
                             <property name="label" translatable="yes">Create corresponding header file</property>
                             <property name="use_action_appearance">False</property>
@@ -319,6 +290,7 @@ The extension will be added according to the type.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -338,6 +310,7 @@ The extension will be added according to the type.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -350,13 +323,14 @@ The extension will be added according to the type.</property>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="add_to_project">
-                            <property name="label" translatable="yes">Add to project</property>
+                            <property name="label" translatable="yes">Add to project target:</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -375,6 +349,7 @@ The extension will be added according to the type.</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -385,32 +360,52 @@ The extension will be added according to the type.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="add_to_project.label">
+                          <object class="GtkAlignment" id="alignment1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Parent:</property>
+                            <property name="left_padding">24</property>
+                            <child>
+                              <object class="AnjutaPmChooserButton" id="add_to_project.combo.parent">
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
+                            <property name="right_attach">2</property>
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="AnjutaPmChooserButton" id="add_to_project.combo.parent">
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkAlignment" id="alignment2">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">24</property>
+                            <child>
+                              <object class="GtkComboBox" id="new.file.menu.license">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">new.file.menu.license.store</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
@@ -448,12 +443,6 @@ The extension will be added according to the type.</property>
       <action-widget response="0">okbutton</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="new.file.menu.license.store">
-    <columns>
-      <!-- column-name license -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="new.file.type.store">
     <columns>
       <!-- column-name type -->
diff --git a/plugins/file-wizard/file.c b/plugins/file-wizard/file.c
index db92a38..48c38fc 100644
--- a/plugins/file-wizard/file.c
+++ b/plugins/file-wizard/file.c
@@ -57,7 +57,6 @@
 #define NEW_FILE_MENU_LICENSE_STORE "new.file.menu.license.store"
 #define NEW_FILE_ADD_TO_PROJECT "add_to_project"
 #define NEW_FILE_ADD_TO_PROJECT_PARENT "add_to_project.combo.parent"
-#define NEW_FILE_ADD_TO_PROJECT_LABEL "add_to_project.label"
 #define NEW_FILE_ADD_TO_REPOSITORY "add_to_repository"
 
 typedef struct _NewFileGUI
@@ -66,7 +65,6 @@ typedef struct _NewFileGUI
 	GtkWidget *dialog;
 	GtkWidget *add_to_project;
 	GtkWidget *add_to_repository;
-	GtkWidget *add_to_project_label;
 	GtkWidget *add_to_project_parent;
 	GtkWidget *ok_button;
 	gboolean showing;
@@ -189,7 +187,6 @@ display_new_file(AnjutaFileWizardPlugin *plugin,
 	has_project = (caps & ANJUTA_PROJECT_CAN_ADD_SOURCE) ? TRUE : FALSE;
 	gtk_widget_set_visible (nfg->add_to_project, has_project);
 	gtk_widget_set_visible (nfg->add_to_project_parent, has_project);
-	gtk_widget_set_visible (nfg->add_to_project_label, has_project);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nfg->add_to_project),
 									  has_project);
 	gtk_widget_set_sensitive (nfg->add_to_project, has_project);
@@ -226,7 +223,6 @@ create_new_file_dialog(IAnjutaDocumentManager *docman)
 	nfg->ok_button = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_OK_BUTTON));
 	nfg->add_to_project = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_PROJECT));
 	nfg->add_to_project_parent = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_PROJECT_PARENT));
-	nfg->add_to_project_label = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_PROJECT_LABEL));
 	nfg->add_to_repository = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_REPOSITORY));
 	nfg->showing = FALSE;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]