Author: rpmcruz
Date: Sun Mar 21 15:52:42 2010
New Revision: 61413
URL: http://svn.opensuse.org/viewcvs/yast?rev=61413&view=rev
Log:
* src/pkg/ygtkpkgfilterview.cc: repo view: added
undo button.
* src/pkg/ygtkpkgfilterview.cc: bug fix: repositories
count was broken, as was the 'none' entry.
* src/ygtkwizard.c: set buttons spacing.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/pkg/CMakeLists.txt
trunk/gtk/src/pkg/YGPackageSelector.cc
trunk/gtk/src/pkg/ygtkpkgfilterview.cc
trunk/gtk/src/pkg/ygtkpkgsearchentry.cc
trunk/gtk/src/ygtkwizard.c
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Sun Mar 21 15:52:42 2010
@@ -1,5 +1,15 @@
2010-03-21 Ricardo Cruz
+ * src/pkg/ygtkpkgfilterview.cc: repo view: added
+ undo button.
+
+ * src/pkg/ygtkpkgfilterview.cc: bug fix: repositories
+ count was broken, as was the 'none' entry.
+
+ * src/ygtkwizard.c: set buttons spacing.
+
+2010-03-21 Ricardo Cruz
+
* src/YGPackageSelector.cc & src/ygtkpkgfilterview.cc:
changed refreshing strategy: UI should feel faster now.
Modified: trunk/gtk/src/pkg/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/src/pkg/CMakeLists.txt (original)
+++ trunk/gtk/src/pkg/CMakeLists.txt Sun Mar 21 15:52:42 2010
@@ -1,22 +1,22 @@
## Makefile.am
set (gtk_pkg_yast_plugin_SRCS
- YGPackageSelectorPluginImpl.cc
YGPackageSelector.cc
- ygtkpkgquerycombo.cc
- ygtkpkglistview.cc
+ YGPackageSelectorPluginImpl.cc
ygtkpkgdetailview.cc
- ygtkpkgsearchentry.cc
+ ygtkpkglistview.cc
ygtkpkgfilterview.cc
- ygtkpkgrpmgroupsview.cc
- ygtkpkgpatternview.cc
ygtkpkglanguageview.cc
- ygtkpkgundolist.cc
ygtkpkgmenubar.cc
- ygtkpkgstatusbar.cc
+ ygtkpkgpatternview.cc
ygtkpkgproductdialog.cc
- yzyppwrapper.cc
+ ygtkpkgquerycombo.cc
+ ygtkpkgrpmgroupsview.cc
+ ygtkpkgsearchentry.cc
+ ygtkpkgstatusbar.cc
+ ygtkpkgundolist.cc
yzypptags.cc
+ yzyppwrapper.cc
ygtkcellrendererbutton.c
ygtkcellrenderersidebutton.c
Modified: trunk/gtk/src/pkg/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/src/pkg/YGPackageSelector.cc (original)
+++ trunk/gtk/src/pkg/YGPackageSelector.cc Sun Mar 21 15:52:42 2010
@@ -475,7 +475,7 @@
break; // only present one toolbox widget as they may be quite large
}
}
- empty ? gtk_widget_hide (m_toolbox) : gtk_widget_show_all (m_toolbox);
+ empty ? gtk_widget_hide (m_toolbox) : gtk_widget_show (m_toolbox);
}
static gboolean refresh_filters_timeout_cb (gpointer data)
Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Sun Mar 21 15:52:42 2010
@@ -243,6 +243,7 @@
gtk_button_set_image (GTK_BUTTON (button), icon);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (upgrade_clicked_cb), this);
+ gtk_widget_show (button);
return button;
}
return NULL;
@@ -342,7 +343,7 @@
}
}
- addRow (GTK_STOCK_MISSING_IMAGE, _("None"), true, GINT_TO_POINTER (1));
+ addRow (GTK_STOCK_MISSING_IMAGE, _("None"), true, GINT_TO_POINTER (2));
}
YGtkPkgRepositoryModel::~YGtkPkgRepositoryModel()
@@ -350,11 +351,7 @@
void YGtkPkgRepositoryModel::updateRow (Ypp::List list, int row, gpointer data)
{
- if (GPOINTER_TO_INT (data) == 1) { // 'none'
- Ypp::PKGroupMatch match (YPKG_GROUP_ORPHANED);
- setRowCount (row, list.count (&match));
- }
- else if (data) {
+ if (GPOINTER_TO_INT (data) == 1) { // normal repo
Ypp::Repository &repo = impl->repos[row-1];
bool isSystem = repo.isSystem();
int count = 0;
@@ -374,36 +371,41 @@
}
setRowCount (row, count);
}
- // else - disabled repos
+ else if (GPOINTER_TO_INT (data) == 2) { // 'none'
+ Ypp::PKGroupMatch match (YPKG_GROUP_ORPHANED);
+ setRowCount (row, list.count (&match));
+ }
}
bool YGtkPkgRepositoryModel::writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data)
{
- if (data) {
+ impl->selected = 0;
+ if (GPOINTER_TO_INT (data) == 1) {
Ypp::Repository &repo = impl->repos[row-1];
query.addRepository (repo);
impl->selected = &repo;
}
- else // 'none'
+ else if (GPOINTER_TO_INT (data) == 2)
query.addCriteria (new Ypp::PKGroupMatch (YPKG_GROUP_ORPHANED));
return true;
}
-static void set_button_repo (GtkButton *button, Ypp::Repository *repo)
+static void sync_toolbox_buttons (Ypp::Repository *repo, GtkWidget *box)
{
- const char *stock, *label;
+ GtkWidget *button, *undo;
+ GList *children = gtk_container_get_children (GTK_CONTAINER (box));
+ button = (GtkWidget *) g_list_nth_data (children, 0);
+ undo = (GtkWidget *) g_list_nth_data (children, 1);
+ g_list_free (children);
+
if (zypp::getZYpp()->resolver()->upgradingRepo (repo->zyppRepo())) {
- label = _("Cancel switching system packages to versions in repository");
- stock = GTK_STOCK_UNDO;
+ gtk_widget_set_sensitive (button, FALSE);
+ gtk_widget_show (undo);
}
else {
- label = _("Switch system packages to the versions in this repository");
- stock = GTK_STOCK_REFRESH;
+ gtk_widget_set_sensitive (button, TRUE);
+ gtk_widget_hide (undo);
}
-
- GtkWidget *icon = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (button, icon);
- gtk_button_set_label (button, label);
}
static void switch_clicked_cb (GtkButton *button, YGtkPkgRepositoryModel *pThis)
@@ -414,8 +416,8 @@
zypp::getZYpp()->resolver()->removeUpgradeRepo (zrepo);
else
zypp::getZYpp()->resolver()->addUpgradeRepo (zrepo);
+ sync_toolbox_buttons (repo, gtk_widget_get_parent (GTK_WIDGET (button)));
Ypp::notifySelModified();
- set_button_repo (button, repo);
}
GtkWidget *YGtkPkgRepositoryModel::createToolboxRow (int row)
@@ -432,14 +434,25 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_widget_show_all (hbox);
return hbox;
}
else if (!impl->selected->isSystem()) {
- GtkWidget *button = gtk_button_new_with_label ("");
- set_button_repo (GTK_BUTTON (button), impl->selected);
+ GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button;
+ button = gtk_button_new_from_stock (GTK_STOCK_UNDO);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (switch_clicked_cb), this);
- return button;
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ button = gtk_button_new_with_label (
+ _("Switch system packages to the versions in this repository"));
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (switch_clicked_cb), this);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ gtk_widget_show_all (hbox);
+ sync_toolbox_buttons (impl->selected, hbox);
+ return hbox;
}
}
return NULL;
Modified: trunk/gtk/src/pkg/ygtkpkgsearchentry.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgsearchentry.cc?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgsearchentry.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgsearchentry.cc Sun Mar 21 15:52:42 2010
@@ -225,6 +225,7 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_widget_show_all (hbox);
return hbox;
}
break;
@@ -237,6 +238,7 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_widget_show_all (hbox);
return hbox;
}
}
Modified: trunk/gtk/src/ygtkwizard.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=61413&r1=61412&r2=61413&view=diff
==============================================================================
--- trunk/gtk/src/ygtkwizard.c (original)
+++ trunk/gtk/src/ygtkwizard.c Sun Mar 21 15:52:42 2010
@@ -642,6 +642,7 @@
wizard->m_buttons = gtk_hbutton_box_new();
gtk_button_box_set_layout (GTK_BUTTON_BOX (wizard->m_buttons), GTK_BUTTONBOX_END);
+ gtk_box_set_spacing (GTK_BOX (wizard->m_buttons), 6);
gtk_widget_show (wizard->m_buttons);
gtk_box_pack_start (GTK_BOX (wizard->m_buttons), wizard->help_button, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (wizard->m_buttons), wizard->release_notes_button,
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
rpmcruz＠svn.opensuse.org