[Aptitude-devel] [PATCH 3 of 5] Add some Etched In border to scrollbars. Add border width to a few tabs. Add spacing to some boxes. Remove frame borders. Remove colon ':' from some tab labels. Replaced 'Info: ' with 'Info on'
Luca Bruno
lethalman88 at gmail.com
Wed Dec 24 14:40:47 UTC 2008
# HG changeset patch
# User Luca Bruno <lethalman88 at gmail.com>
# Date 1230126046 -3600
# Node ID 8c6559fcd9b4b7c4d879bb9c69cc3f64a4b42571
# Parent 1004646cd04a82a6b260e4b292616a4d08f8ef84
Add some Etched In border to scrollbars. Add border width to a few tabs. Add spacing to some boxes. Remove frame borders. Remove colon ':' from some tab labels. Replaced 'Info: ' with 'Info on'
diff --git a/src/gtk/aptitude.glade b/src/gtk/aptitude.glade
--- a/src/gtk/aptitude.glade
+++ b/src/gtk/aptitude.glade
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Dec 23 21:50:35 2008 -->
+<!--Generated with glade3 3.4.5 on Wed Dec 24 14:32:06 2008 -->
<glade-interface>
<widget class="GtkWindow" id="main_window">
<property name="title" translatable="yes">Aptitude Package Manager</property>
@@ -423,6 +423,7 @@
<property name="tab_vborder">0</property>
<child>
<widget class="GtkVBox" id="dashboard_main">
+ <property name="border_width">6</property>
<child>
<widget class="GtkHBox" id="hbox7">
<property name="height_request">32</property>
@@ -498,6 +499,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="dashboard_upgrades_treeview">
<property name="visible">True</property>
@@ -689,9 +691,11 @@
<child>
<widget class="GtkHPaned" id="main_packages_hpaned">
<property name="can_focus">True</property>
+ <property name="border_width">6</property>
<child>
<widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox2">
<property name="height_request">32</property>
@@ -766,6 +770,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="main_packages_treeview">
<property name="visible">True</property>
@@ -824,11 +829,11 @@
<child>
<widget class="GtkButton" id="main_notebook_packages_close">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
<property name="response_id">0</property>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="main_notebook_packages_close_image">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -836,6 +841,8 @@
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -895,6 +902,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="main_info_versionsview">
<property name="visible">True</property>
@@ -1133,6 +1141,8 @@
</child>
<child>
<widget class="GtkVBox" id="main_resolver_vbox">
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow14">
<property name="visible">True</property>
@@ -1257,6 +1267,7 @@
<child>
<widget class="GtkHPaned" id="dependency_path_main">
<property name="can_focus">True</property>
+ <property name="border_width">6</property>
<child>
<widget class="GtkVPaned" id="vpaned1">
<property name="visible">True</property>
@@ -1265,6 +1276,7 @@
<widget class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -1272,6 +1284,7 @@
<child>
<widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox4">
<property name="height_request">32</property>
@@ -1346,6 +1359,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="dependency_path_start_packages_treeview">
<property name="visible">True</property>
@@ -1384,6 +1398,7 @@
<widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -1391,6 +1406,7 @@
<child>
<widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox5">
<property name="height_request">32</property>
@@ -1465,6 +1481,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="dependency_path_end_packages_treeview">
<property name="visible">True</property>
@@ -1506,10 +1523,19 @@
</packing>
</child>
<child>
- <widget class="GtkTreeView" id="dependency_path_results_treeview">
+ <widget class="GtkScrolledWindow" id="scrolledwindow18">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_clickable">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="dependency_path_results_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
@@ -1690,6 +1716,7 @@
<child>
<widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkProgressBar" id="main_progressbar">
<property name="width_request">250</property>
@@ -1815,6 +1842,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTreeView" id="edit_package_columns_treeview">
<property name="visible">True</property>
diff --git a/src/gtk/gui.cc b/src/gtk/gui.cc
--- a/src/gtk/gui.cc
+++ b/src/gtk/gui.cc
@@ -697,12 +697,12 @@
void AptitudeWindow::do_resolver()
{
- tab_add(new ResolverTab(_("Resolver:")));
+ tab_add(new ResolverTab(_("Resolver")));
}
void AptitudeWindow::do_preview()
{
- tab_add(new PreviewTab(_("Preview:")));
+ tab_add(new PreviewTab(_("Preview")));
}
void AptitudeWindow::do_show_broken()
@@ -998,7 +998,7 @@
void do_packages()
{
- tab_add(new PackagesTab(_("Packages:")));
+ tab_add(new PackagesTab(_("Packages")));
}
void do_installremove()
@@ -1261,7 +1261,7 @@
void AptitudeWindow::do_dashboard()
{
- tab_add(new DashboardTab(_("Dashboard:")));
+ tab_add(new DashboardTab(_("Dashboard")));
}
void AptitudeWindow::update_package_menu()
@@ -1454,7 +1454,7 @@
refXml->get_widget_derived("main_window", pMainWindow);
- pMainWindow->tab_add(new DashboardTab(_("Dashboard:")));
+ pMainWindow->tab_add(new DashboardTab(_("Dashboard")));
//This is the loop
diff --git a/src/gtk/info.cc b/src/gtk/info.cc
--- a/src/gtk/info.cc
+++ b/src/gtk/info.cc
@@ -590,7 +590,7 @@
version_name = ver.end() ? "" : ver.VerStr();
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
- set_label("Info: " + Glib::ustring(pkg.Name()));
+ set_label("Info on " + Glib::ustring(pkg.Name()));
PackageInformation info(pkg, ver);
More information about the Aptitude-devel
mailing list