Changeset 1912:21be20b01572

Timestamp:

08/16/08 18:19:36 (2 years ago)

Author:

Obey Arthur Liu <arthur@…>

Branch:

gtk

Message:

Integrate ui-main.patch from Andrew. Closing http://dev.graffit.net/aptitude/trac/ticket/3 .

Files:

• src/gtk/ui-main.glade (modified) (5 diffs)

src/gtk/ui-main.glade

@@ -308 +308 @@
                       <widget class="GtkImageMenuItem" id="menu_do_keep">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Flag the currently selected package and its configuration files for removal</property>
+                        <property name="tooltip" translatable="yes">Cancel any pending installation, upgrade, or removal of the currently selected package, and remove any hold that was set on the package</property>
                         <property name="label" translatable="yes">_Keep</property>
                         <property name="use_underline">True</property>
@@ -314 +314 @@
                           <widget class="GtkImage" id="menu-item-image21">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-media-pause</property>
+                            <property name="stock">gtk-media-rewind</property>
                           </widget>
                         </child>
@@ -328 +328 @@
                           <widget class="GtkImage" id="menu-item-image22">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-media-rewind</property>
+                            <property name="stock">gtk-media-pause</property>
                           </widget>
                         </child>
@@ -342 +342 @@
                           <widget class="GtkImage" id="menu-item-image23">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
+                            <property name="stock">gtk-execute</property>
                           </widget>
                         </child>
@@ -356 +356 @@
                           <widget class="GtkImage" id="menu-item-image24">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="menu_do_forbid">
+                            <property name="stock">gtk-select-color</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_do_forbid">
                         <property name="visible">True</property>
                         <property name="tooltip" translatable="yes">Forbid the candidate version of the selected package from being installed; newer versions of the package will be installed as usual</property>
                         <property name="label" translatable="yes">_Forbid Version</property>
                         <property name="use_underline">True</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image31">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-dialog-error</property>
+                          </widget>
+                        </child>
                       </widget>
                     </child>