Author: rpmcruz
Date: Wed Jan 27 20:42:38 2010
New Revision: 60586
URL: http://svn.opensuse.org/viewcvs/yast?rev=60586&view=rev
Log:
* src/pkg/YGPackageSelector.cc: added --embold-installed-row
and --save-delete-buttons flags.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGPackageSelectorPluginStub.cc
trunk/gtk/src/pkg/YGPackageSelector.cc
trunk/gtk/src/pkg/ygtkpackageview.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60586&r1=60585&r2=60586&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Wed Jan 27 20:42:38 2010
@@ -1,3 +1,8 @@
+2010-01-27 Ricardo Cruz
+
+ * src/pkg/YGPackageSelector.cc: added --embold-installed-row
+ and --save-delete-buttons flags.
+
2010-01-26 Ricardo Cruz
* src/pkg/yzyppwrapper.h/cc: changed PkgList property
Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginStub.cc?rev=60586&r1=60585&r2=60586&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original)
+++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Wed Jan 27 20:42:38 2010
@@ -23,8 +23,9 @@
undo_old_style = false, undo_log_all = false, undo_log_changed = false,
undo_box = true,
status_col = false, action_col = true,
- action_col_as_button = false, action_col_as_check = false, action_col_label = true,
+ action_col_as_button = false, save_delete_buttons = false, action_col_as_check = false, action_col_label = true,
version_col = true, single_line_rows = false, colorful_rows = false,
+ embold_installed_row = false,
italicize_changed_row = false, golden_changed_row = true,
details_start_hide = false, toolbar_top = false, toolbar_yast = false,
arrange_by = false;
@@ -63,11 +64,13 @@
{ "status-col", &status_col },
{ "action-col", &action_col },
{ "action-col-as-button", &action_col_as_button },
+ { "save-delete-buttons", &save_delete_buttons },
{ "action-col-as-check", &action_col_as_check },
{ "action-col-label", &action_col_label },
{ "version-col", &version_col },
{ "single-line-rows", &single_line_rows },
{ "colorful-rows", &colorful_rows },
+ { "embold-installed-row", &embold_installed_row },
{ "italicize-changed-row", &italicize_changed_row },
{ "golden-changed-row", &golden_changed_row },
{ "details-start-hide", &details_start_hide },
Modified: trunk/gtk/src/pkg/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=60586&r1=60585&r2=60586&view=diff
==============================================================================
--- trunk/gtk/src/pkg/YGPackageSelector.cc (original)
+++ trunk/gtk/src/pkg/YGPackageSelector.cc Wed Jan 27 20:42:38 2010
@@ -2165,7 +2165,7 @@
gtk_entry_set_icon_from_stock (GTK_ENTRY (m_entry),
GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
- gtk_entry_set_icon_activatable (GTK_ENTRY (editable), GTK_ENTRY_ICON_PRIMARY, TRUE);
+ gtk_entry_set_icon_activatable (GTK_ENTRY (m_entry), GTK_ENTRY_ICON_PRIMARY, TRUE);
m_clearIcon = false;
g_signal_connect (G_OBJECT (m_entry), "changed",
@@ -2364,8 +2364,8 @@
void appendRow (GtkTreeIter *iter)
{
- gtk_list_store_append (m_store, &iter);
- gtk_list_store_set (m_store, &iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1);
+ gtk_list_store_append (m_store, iter);
+ gtk_list_store_set (m_store, iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1);
}
};
@@ -2545,7 +2545,7 @@
else
gtk_list_store_set (m_store, &iter, 0, repo->name.c_str(), -1);
}
- gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, ,
+ gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo,
ENABLED_COLUMN, repo->enabled, -1);
const gchar *icon = getRepositoryStockIcon (repo->url);
@@ -3734,7 +3734,12 @@
}
else {
m_all_view = ygtk_package_view_new (TRUE);
- m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP);
+ if (action_col) {
+ if (action_col_as_button)
+ m_all_view->appendButtonColumn (NULL, INSTALLED_CHECK_PROP);
+ else // action_col_as_check
+ m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP);
+ }
m_all_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1);
m_all_view->appendTextColumn (_("Version"), VERSION_PROP, true, 120);
m_all_view->appendTextColumn (_("Size"), SIZE_PROP, true, 80);
Modified: trunk/gtk/src/pkg/ygtkpackageview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?rev=60586&r1=60585&r2=60586&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpackageview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpackageview.cc Wed Jan 27 20:42:38 2010
@@ -21,7 +21,8 @@
#include
extern bool status_col, action_col, action_col_as_button, action_col_as_check,
- action_col_label, version_col, colorful_rows, italicize_changed_row,
+ save_delete_buttons,
+ action_col_label, version_col, colorful_rows, embold_installed_row, italicize_changed_row,
golden_changed_row, single_line_rows;
//** Icons resources
@@ -591,8 +592,14 @@
break;
}
case WEIGHT_PROP: {
+#if 0
bool highlight = segment->list.highlight (package);
int weight = highlight ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL;
+#endif
+ int weight = PANGO_WEIGHT_NORMAL;
+ if (embold_installed_row)
+ if (package->isInstalled())
+ weight = PANGO_WEIGHT_BOLD;
g_value_set_int (value, weight);
break;
}
@@ -617,9 +624,9 @@
if (package->toModify())
stock = GTK_STOCK_UNDO;
else if (package->isInstalled())
- stock = GTK_STOCK_REMOVE;
+ stock = save_delete_buttons ? GTK_STOCK_DELETE : GTK_STOCK_REMOVE;
else
- stock = GTK_STOCK_ADD;
+ stock = save_delete_buttons ? GTK_STOCK_SAVE : GTK_STOCK_ADD;
g_value_set_string (value, g_strdup (stock));
break;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
