Author: rpmcruz
Date: Tue Mar 9 18:23:00 2010
New Revision: 61214
URL: http://svn.opensuse.org/viewcvs/yast?rev=61214&view=rev
Log:
* src/pkg/ygtkpkgundolist.cc: work-around GTK bug: align
changes dialog icon to the left.
* src/pkg/ygtkpkglistview.cc: bug fix: don't show
undo buttons for dependencies (for changes dialog).
Spotted by Atri Bhattacharya.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/pkg/YGPackageSelector.cc
trunk/gtk/src/pkg/ygtkpkglistview.cc
trunk/gtk/src/pkg/ygtkpkgundolist.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61214&r1=61213&r2=61214&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Mar 9 18:23:00 2010
@@ -1,3 +1,12 @@
+2010-03-09 Ricardo Cruz
+
+ * src/pkg/ygtkpkgundolist.cc: work-around GTK bug: align
+ changes dialog icon to the left.
+
+ * src/pkg/ygtkpkglistview.cc: bug fix: don't show
+ undo buttons for dependencies (for changes dialog).
+ Spotted by Atri Bhattacharya.
+
2010-03-05 Ricardo Cruz
* src/ygtkwizard.c: when starting a module, better an empty
Modified: trunk/gtk/src/pkg/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=61214&r1=61213&r2=61214&view=diff
==============================================================================
--- trunk/gtk/src/pkg/YGPackageSelector.cc (original)
+++ trunk/gtk/src/pkg/YGPackageSelector.cc Tue Mar 9 18:23:00 2010
@@ -368,11 +368,13 @@
column = gtk_tree_view_column_new_with_attributes ("", renderer,
"visible", SHOW_TOGGLE_COL, "active", ACTIVE_TOGGLE_COL, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (view), column);
+
renderer = gtk_cell_renderer_text_new();
g_object_set (G_OBJECT (renderer), "wrap-width", 400, NULL);
column = gtk_tree_view_column_new_with_attributes ("", renderer,
"text", TEXT_COL, "weight", WEIGHT_TEXT_COL, "xpad", TEXT_PAD_COL, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (view), column);
+
gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
gtk_widget_set_has_tooltip (view, TRUE);
Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?rev=61214&r1=61213&r2=61214&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkglistview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkglistview.cc Tue Mar 9 18:23:00 2010
@@ -22,7 +22,8 @@
enum ImplProperty {
// booleans
- HAS_UPGRADE_PROP = TOTAL_PROPS, TO_UPGRADE_PROP, TO_MODIFY_PROP, IS_LOCKED_PROP,
+ HAS_UPGRADE_PROP = TOTAL_PROPS, TO_UPGRADE_PROP,
+ MANUAL_MODIFY_PROP, IS_LOCKED_PROP,
// integer
XPAD_PROP,
// string
@@ -41,8 +42,8 @@
case STATUS_ICON_PROP:
return G_TYPE_STRING;
case INSTALLED_CHECK_PROP:
- case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP: case TO_MODIFY_PROP:
- case IS_LOCKED_PROP:
+ case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP:
+ case MANUAL_MODIFY_PROP: case IS_LOCKED_PROP:
return G_TYPE_BOOLEAN;
case XPAD_PROP:
return G_TYPE_INT;
@@ -177,8 +178,8 @@
g_value_set_string (value, str.c_str());
break;
}
- case INSTALLED_CHECK_PROP: { // as it is, will it be installed at apply?
- bool installed;
+ case INSTALLED_CHECK_PROP: {
+ bool installed; // whether it is installed or will be at apply
if (sel.toInstall())
installed = true;
else if (sel.toRemove())
@@ -194,8 +195,8 @@
case TO_UPGRADE_PROP:
g_value_set_boolean (value, sel.hasUpgrade() && sel.toInstall());
break;
- case TO_MODIFY_PROP:
- g_value_set_boolean (value, sel.toModify());
+ case MANUAL_MODIFY_PROP:
+ g_value_set_boolean (value, sel.toModify() && !sel.toModifyAuto());
break;
case IS_LOCKED_PROP:
g_value_set_boolean (value, !sel.isLocked());
@@ -719,7 +720,7 @@
GtkCellRenderer *renderer = ygtk_cell_renderer_button_new();
GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (
header, renderer, "sensitive", IS_LOCKED_PROP,
- "visible", TO_MODIFY_PROP, NULL);
+ "visible", MANUAL_MODIFY_PROP, "visible", NULL);
if (impl->colorModified)
gtk_tree_view_column_add_attribute (column, renderer,
"cell-background", BACKGROUND_PROP);
Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?rev=61214&r1=61213&r2=61214&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Tue Mar 9 18:23:00 2010
@@ -237,6 +237,10 @@
gtk_widget_show (image);
gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_YES, NULL);
+
+ // work-around for GTK bug: when you set a custom icon, it is packed as expanded
+ GtkWidget *hbox = gtk_widget_get_parent (image);
+ gtk_box_set_child_packing (GTK_BOX (hbox), image, FALSE, TRUE, 0, GTK_PACK_START);
}
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
rpmcruz＠svn.opensuse.org