January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60427 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageClients.ycp
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 12:13:47 2010 New Revision: 60427 URL: http://svn.opensuse.org/viewcvs/yast?rev=60427&view=rev Log: - show textual error messages during commit (bnc #546012) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageClients.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jan 18 12:13:47 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 18 11:53:51 CET 2010 - aschnell(a)suse.de + +- show textual error messages during commit (bnc #546012) + +------------------------------------------------------------------- Fri Jan 15 11:42:55 CET 2010 - aschnell(a)suse.de - implemented popup to query user whether to ignore failures during Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Mon Jan 18 12:13:47 2010 @@ -15,8 +15,15 @@ import "SlideShow"; import "StorageCallbacks"; + import "LibStorage"; + import "LibStorage::StorageInterface"; + textdomain "storage"; + + any sint = nil; + + boolean enable_popup = false; list<string> texts = []; @@ -84,6 +91,12 @@ string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; + string tmp = LibStorage::StorageInterface::getErrorString(sint, error); + if (!isempty(tmp)) + { + text = text + tmp + "\n\n"; + } + text = text + sformat(_("System error code was: %1"), error) + "\n\n"; if (!isempty(extended_message)) @@ -131,9 +144,12 @@ } -global void InstallCallbacks(any sint) +global void InstallCallbacks(any value) { y2milestone( "InstallCallbacks" ); + + sint = value; + StorageCallbacks::ProgressBar("StorageClients::ProgressBar"); StorageCallbacks::ShowInstallInfo("StorageClients::ShowInstallInfo"); StorageCallbacks::InfoPopup("StorageClients::InfoPopup"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60426 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc
by tgoettlicher＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: tgoettlicher Date: Mon Jan 18 10:38:29 2010 New Revision: 60426 URL: http://svn.opensuse.org/viewcvs/yast?rev=60426&view=rev Log: - fixed bnc #571200 - filter out 32 bit debuginfo packages - V 2.18.20 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=60426&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Mon Jan 18 10:38:29 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "20") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Mon Jan 18 10:38:29 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 18 10:34:08 CET 2010 - tgoettlicher(a)suse.de + +- fixed bnc #571200 - filter out 32 bit debuginfo packages +- V 2.18.20 + +------------------------------------------------------------------- Mon Dec 21 12:39:06 CET 2009 - tgoettlicher(a)suse.de - fixed bnc #564321: Alt-P shortcut overloaded in YaST2 Software Management Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Mon Jan 18 10:38:29 2010 @@ -783,7 +783,7 @@ this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-\\d+bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60425 - /trunk/storage/storage/src/testsuite/
by aschnell＠svn.opensuse.org 18 Jan '10

18 Jan '10

Author: aschnell Date: Mon Jan 18 10:36:19 2010 New Revision: 60425 URL: http://svn.opensuse.org/viewcvs/yast?rev=60425&view=rev Log: - ignore generated directories Modified: trunk/storage/storage/src/testsuite/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60409 - in /trunk/gtk: ChangeLog src/pkg/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 16 Jan '10

16 Jan '10

Author: rpmcruz Date: Sat Jan 16 21:04:58 2010 New Revision: 60409 URL: http://svn.opensuse.org/viewcvs/yast?rev=60409&view=rev Log: * src/pkg/YGPackageSelector.cc: made "view changes" working, and sticked a close button as well. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60409&r1=60408… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Jan 16 21:04:58 2010 @@ -7,6 +7,9 @@ * src/ygtkwizard.h/c: added method for custom menu-bar. + * src/pkg/YGPackageSelector.cc: made "view changes" + working, and sticked a close button as well. + 2010-01-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added repositories combo and Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Sat Jan 16 21:04:58 2010 @@ -340,7 +340,7 @@ GtkWidget *getWidget() { return m_handle_box; } - ChangesPane() + ChangesPane (bool show_handle) : m_entries (NULL) { GtkWidget *heading = gtk_label_new (_("To perform now:")); @@ -358,7 +358,6 @@ gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (vbox), "expose-event", G_CALLBACK (paint_white_expose_cb), NULL); @@ -377,41 +376,50 @@ gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); - GtkWidget *frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (frame), scroll); - - m_handle_box = gtk_handle_box_new(); - gtk_container_add (GTK_CONTAINER (m_handle_box), frame); - gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_handle_box), GTK_POS_TOP); - gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_handle_box), GTK_POS_RIGHT); + if (show_handle) { + GtkWidget *frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (frame), scroll); + + m_handle_box = gtk_handle_box_new(); + gtk_container_add (GTK_CONTAINER (m_handle_box), frame); + gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_handle_box), GTK_POS_TOP); + gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_handle_box), GTK_POS_RIGHT); + } + else + m_handle_box = scroll; Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); -/* if (pkg_selector->onlineUpdateMode()) - query->addType (Ypp::Package::PATCH_TYPE);*/ +// if (pkg_selector->onlineUpdateMode()) m_pool = Ypp::PkgQuery (Ypp::Package::PACKAGE_TYPE, query); // initialize list -- there could already be packages modified for (int i = 0; i < m_pool.size(); i++) ChangesPane::entryInserted (m_pool, i, m_pool.get (i)); m_pool.addListener (this); - if (undo_log_all || undo_log_changed) { - GtkWidget *log_box = gtk_vbox_new (FALSE, 2); - GtkWidget *heading = gtk_label_new (_("Past changes:")); - YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); - gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); - gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), log_box, TRUE, TRUE, 0); - - for (int i = 0; Ypp::get()->getLog()->getEntry (i); i++) { - Ypp::Log::Entry *entry = Ypp::get()->getLog()->getEntry (i); - if (entry->package) - if (undo_log_all || LogEntry::canUndo (entry->package, entry->action)) { - // FIXME: free these stuff - LogEntry *log_entry = new LogEntry (entry->package, entry->action); - gtk_box_pack_start (GTK_BOX (log_box), log_entry->getWidget(), FALSE, TRUE, 0); - } - } + if (undo_log_all || undo_log_changed) + gtk_box_pack_start (GTK_BOX (vbox), createPastChangesWidget(), TRUE, TRUE, 0); + } + + GtkWidget *createPastChangesWidget() + { + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + GtkWidget *log_box = gtk_vbox_new (FALSE, 2); + GtkWidget *heading = gtk_label_new (_("Past changes:")); + YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), log_box, TRUE, TRUE, 0); + + for (int i = 0; Ypp::get()->getLog()->getEntry (i); i++) { + Ypp::Log::Entry *entry = Ypp::get()->getLog()->getEntry (i); + if (entry->package) + if (undo_log_all || LogEntry::canUndo (entry->package, entry->action)) { + // FIXME: free these stuff + LogEntry *log_entry = new LogEntry (entry->package, entry->action); + gtk_box_pack_start (GTK_BOX (log_box), log_entry->getWidget(), FALSE, TRUE, 0); + } } + return vbox; } ~ChangesPane() @@ -3281,17 +3289,20 @@ } }; +// undo box + class UndoBox : public Ypp::PkgList::Listener { -GtkWidget *m_undo_box, *m_undo_package, *m_undo_details; +GtkWidget *m_undo_box, *m_undo_package, *m_undo_details, *m_title; Ypp::PkgList m_pool; Ypp::Package *m_package; +bool m_closed; public: GtkWidget *getWidget() { return m_undo_box; } - UndoBox() + UndoBox() : m_closed (false) { Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); // if (pkg_selector->onlineUpdateMode()) @@ -3303,10 +3314,16 @@ GtkWidget *vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_add (GTK_CONTAINER (m_undo_box), vbox); - GtkWidget *title = gtk_label_new (_("Software changes")); - gtk_misc_set_alignment (GTK_MISC (title), 0, .5); - YGUtils::setWidgetFont (title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); - gtk_box_pack_start (GTK_BOX (vbox), title, FALSE, TRUE, 0); + m_title = gtk_label_new (_("Software changes")); + gtk_misc_set_alignment (GTK_MISC (m_title), .5, .5); + YGUtils::setWidgetFont (m_title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + GtkWidget *close_button = create_small_button (GTK_STOCK_CLOSE, _("Close")); + g_signal_connect (G_OBJECT (close_button), "clicked", + G_CALLBACK (close_clicked_cb), this); + GtkWidget *title_box = gtk_hbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (title_box), m_title, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (title_box), close_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), title_box, FALSE, TRUE, 0); GtkWidget *package_box = gtk_hbox_new (FALSE, 4); m_undo_package = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (m_undo_package), 0, .5); @@ -3319,10 +3336,17 @@ m_undo_details = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (m_undo_details), 0, .5); gtk_box_pack_start (GTK_BOX (vbox), m_undo_details, FALSE, TRUE, 0); - GtkWidget *details_button = gtk_link_button_new (_("View details...")); - GtkWidget *details_align = gtk_alignment_new (1, .5, 0, 0); - gtk_container_add (GTK_CONTAINER (details_align), details_button); - gtk_box_pack_start (GTK_BOX (vbox), details_align, FALSE, TRUE, 0); + char *details_str = g_strdup_printf ("<a href=\"details\">%s</a>", _("View details...")); + GtkWidget *details_label = gtk_label_new (details_str); + gtk_label_set_use_markup (GTK_LABEL (details_label), TRUE); + g_free (details_str); + gtk_label_set_track_visited_links (GTK_LABEL (details_label), FALSE); + gtk_misc_set_alignment (GTK_MISC (details_label), 1, .5); + gtk_box_pack_start (GTK_BOX (vbox), details_label, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (details_label), "activate-link", + G_CALLBACK (details_link_cb), this); + + // TODO: start by showing available disk space } ~UndoBox() @@ -3335,6 +3359,7 @@ void setPackage (Ypp::Package *package) { + if (m_closed) return; m_package = package; std::string action; @@ -3364,6 +3389,7 @@ Ypp::Disk *disk = Ypp::get()->getDisk(); for (int i = 0; disk->getPartition (i); i++) { const Ypp::Disk::Partition *part = disk->getPartition (i); + // FIXME: check for '/' in a soft manner, /usr/ as a hard check if (part->path == "/usr" || part->path == "/usr/" || part->path == "/") delta_str = part->delta_str; } @@ -3389,12 +3415,71 @@ { setPackage (package); } virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) - { gtk_widget_hide (m_undo_box); } + { if (package == m_package) gtk_widget_hide (m_undo_box); } virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) {} static void undo_clicked_cb (GtkButton *button, UndoBox *pThis) { pThis->m_package->undo(); } + + static void close_clicked_cb (GtkButton *button, UndoBox *pThis) + { gtk_widget_hide (pThis->m_undo_box); pThis->m_closed = true; } + + static GtkWidget *createViewPort (GtkWidget *child) + { + GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), child); + GtkWidget *port = gtk_bin_get_child (GTK_BIN (scroll)); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (port), GTK_SHADOW_NONE); + return scroll; + } + + static void past_expander_expanded_cb (GObject *object, + GParamSpec *param_spec, ChangesPane *changes) + { + GtkExpander *expander = GTK_EXPANDER (object); + gboolean expanded = gtk_expander_get_expanded (expander); + if (expanded && !g_object_get_data (object, "has-expanded")) { + g_object_set_data (object, "has-expanded", GINT_TO_POINTER (1)); + GtkWidget *widget = createViewPort (changes->createPastChangesWidget()); + gtk_widget_show_all (widget); + gtk_container_add (GTK_CONTAINER (object), widget); + } + GtkWidget *widget = GTK_WIDGET (object); + gtk_box_set_child_packing (GTK_BOX (gtk_widget_get_parent (widget)), + widget, expanded, TRUE, 0, GTK_PACK_START); + } + + static gboolean details_link_cb (GtkLabel *label, gchar *uri, UndoBox *pThis) + { + ChangesPane *changes = new ChangesPane (false); + + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, + "%s", _("Review of changes")); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); + gtk_window_set_default_size (GTK_WINDOW (dialog), 550, 500); + gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); + + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), changes->getWidget(), TRUE, TRUE, 0); + GtkWidget *expander = gtk_expander_new (_("Past changes")); + g_signal_connect (G_OBJECT (expander), "notify::expanded", + G_CALLBACK (past_expander_expanded_cb), changes); + gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_widget_show_all (dialog); + changes->startHack(); + + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + delete changes; + return TRUE; + } }; class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener @@ -3546,7 +3631,7 @@ GtkWidget *undo_widget; if (undo_side) { if (undo_old_style) { - changes_pane = new ChangesPane(); + changes_pane = new ChangesPane (true); undo_widget = changes_pane->getWidget(); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60408 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc src/pkg/ygtkpackageview.cc src/ygtkwizard.c src/ygtkwizard.h
by rpmcruz＠svn.opensuse.org 16 Jan '10

16 Jan '10

Author: rpmcruz Date: Sat Jan 16 17:17:07 2010 New Revision: 60408 URL: http://svn.opensuse.org/viewcvs/yast?rev=60408&view=rev Log: * src/pkg/YGPackageSelector.cc: added --undo-box flag. * src/pkg/YGPackageSelector.cc: added menu-bar (not enabled by default yet). * src/ygtkwizard.h/c: added method for custom menu-bar. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60408&r1=60407… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Jan 16 17:17:07 2010 @@ -1,3 +1,12 @@ +2010-01-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added --undo-box flag. + + * src/pkg/YGPackageSelector.cc: added menu-bar (not + enabled by default yet). + + * src/ygtkwizard.h/c: added method for custom menu-bar. + 2010-01-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added repositories combo and Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Sat Jan 16 17:17:07 2010 @@ -20,6 +20,7 @@ status_side = true, status_top = false, status_tabs = false, status_tabs_as_actions = false, undo_side = false, undo_tab = true, undo_old_style = false, undo_log_all = false, undo_log_changed = false, + undo_box = false, status_col = false, action_col = true, action_col_as_button = false, action_col_as_check = false, action_col_label = true, version_col = true, single_line_rows = false, colorful_rows = false, @@ -56,6 +57,7 @@ { "undo-old-style", &undo_old_style }, { "undo-log-all", &undo_log_all }, { "undo-log-changed", &undo_log_changed }, + { "undo-box", &undo_box }, { "status-col", &status_col }, { "action-col", &action_col }, { "action-col-as-button", &action_col_as_button }, Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Sat Jan 16 17:17:07 2010 @@ -33,7 +33,8 @@ categories_side, repositories_side, categories_top, repositories_top, status_side, status_top, status_tabs, status_tabs_as_actions, - undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, status_col, + undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, undo_box, + status_col, action_col, action_col_as_button, action_col_as_check, version_col, single_line_rows, details_start_hide, toolbar_top, toolbar_yast, arrange_by; @@ -42,8 +43,8 @@ static gboolean paint_white_expose_cb (GtkWidget *widget, GdkEventExpose *event) { cairo_t *cr = gdk_cairo_create (widget->window); - GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gdk_cairo_set_source_color (cr, &color); + GdkColor white = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gdk_cairo_set_source_color (cr, &white); cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); cairo_fill (cr); @@ -353,7 +354,7 @@ gtk_misc_set_alignment (GTK_MISC (m_empty_label), 0.5, 0.5); GtkWidget *vbox = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); // FIXME: are these inner borders? gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); @@ -1676,6 +1677,104 @@ }; #endif +static void errorMsg (const std::string &header, const std::string &message) +{ + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", header.c_str()); + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + "%s", message.c_str()); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +static void import_file_cb (GtkMenuItem *item) +{ + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Import Package List"), + YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + if (ret == GTK_RESPONSE_ACCEPT) { + char *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (!Ypp::get()->importList (filename)) { + std::string error = _("Couldn't load package list from: "); + error += filename; + errorMsg (_("Import Failed"), error); + } + g_free (filename); + } + gtk_widget_destroy (dialog); +} + +static void export_file_cb (GtkMenuItem *item) +{ + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Export Package List"), + YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + if (ret == GTK_RESPONSE_ACCEPT) { + char *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (!Ypp::get()->exportList (filename)) { + std::string error = _("Couldn't save package list to: "); + error += filename; + errorMsg (_("Export Failed"), error); + } + g_free (filename); + } + gtk_widget_destroy (dialog); +} + +static void create_solver_testcase_cb (GtkMenuItem *item) +{ + const char *dirname = "/var/log/YaST2/solverTestcase"; + std::string msg = _("Use this to generate extensive logs to help tracking down " + "bugs in the dependency resolver.\nThe logs will be stored in " + "directory: "); + msg += dirname; + + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, + "%s", _("Create Dependency Resolver Test Case")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); + int ret = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + if (ret == GTK_RESPONSE_OK) { + if (Ypp::get()->createSolverTestcase (dirname)) { + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, "%s", _("Success")); + msg = _("Dependency resolver test case written to"); + msg += " <tt>"; + msg += dirname; + msg += "</tt>\n"; + msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + "%s", msg.c_str()); + ret = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (ret == GTK_RESPONSE_YES) + YGUI::ui()->askSaveLogs(); + } + else { + msg = _("Failed to create dependency resolver test case.\n" + "Please check disk space and permissions for"); + msg += " <tt>"; + msg += dirname; + msg += "</tt>"; + errorMsg ("Error", msg.c_str()); + } + } +} + class ToolsBox { GtkWidget *m_box; @@ -1710,105 +1809,6 @@ gtk_box_pack_start (GTK_BOX (m_box), button, FALSE, TRUE, 0); gtk_widget_show_all (m_box); } - -private: - static void errorMsg (const std::string &header, const std::string &message) - { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - "%s", header.c_str()); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - "%s", message.c_str()); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - - static void import_file_cb (GtkMenuItem *item, ToolsBox *pThis) - { - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Import Package List"), - YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - if (ret == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (!Ypp::get()->importList (filename)) { - std::string error = _("Couldn't load package list from: "); - error += filename; - errorMsg (_("Import Failed"), error); - } - g_free (filename); - } - gtk_widget_destroy (dialog); - } - - static void export_file_cb (GtkMenuItem *item, ToolsBox *pThis) - { - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Export Package List"), - YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - if (ret == GTK_RESPONSE_ACCEPT) { - char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (!Ypp::get()->exportList (filename)) { - std::string error = _("Couldn't save package list to: "); - error += filename; - errorMsg (_("Export Failed"), error); - } - g_free (filename); - } - gtk_widget_destroy (dialog); - } - - static void create_solver_testcase_cb (GtkMenuItem *item) - { - const char *dirname = "/var/log/YaST2/solverTestcase"; - std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency resolver.\nThe logs will be stored in " - "directory: "); - msg += dirname; - - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - "%s", _("Create Dependency Resolver Test Case")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); - int ret = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - if (ret == GTK_RESPONSE_OK) { - if (Ypp::get()->createSolverTestcase (dirname)) { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency resolver test case written to"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>\n"; - msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - "%s", msg.c_str()); - ret = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (ret == GTK_RESPONSE_YES) - YGUI::ui()->askSaveLogs(); - } - else { - msg = _("Failed to create dependency resolver test case.\n" - "Please check disk space and permissions for"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>"; - errorMsg ("Error", msg.c_str()); - } - } - } }; //** Dialogs @@ -2931,6 +2931,8 @@ return vpaned; } +// expander box + static void ygtk_expander_box_size_allocate (GtkWidget *vbox, GtkAllocation *alloc) { GtkContainer *container = GTK_CONTAINER (vbox); @@ -2996,6 +2998,47 @@ return widget; } +// tooltip box + +typedef struct YGtkTooltipBox +{ GtkEventBox parent; } YGtkTooltipBox; + +typedef struct YGtkTooltipBoxClass +{ GtkEventBoxClass parent_class; } YGtkTooltipBoxClass; + +G_DEFINE_TYPE (YGtkTooltipBox, ygtk_tooltip_box, GTK_TYPE_EVENT_BOX) + +static void ygtk_tooltip_box_init (YGtkTooltipBox *tooltip) +{ + GdkColor yellow = { 0, 246 << 8, 246 << 8, 187 << 8 }; + gtk_widget_modify_bg (GTK_WIDGET (tooltip), GTK_STATE_NORMAL, &yellow); +} + +static gboolean ygtk_tooltip_box_expose_event (GtkWidget *tooltip, GdkEventExpose *event) +{ + gtk_paint_flat_box (tooltip->style, tooltip->window, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, tooltip, + "tooltip", 0, 0, tooltip->allocation.width, + tooltip->allocation.height); + GtkWidget *child = GTK_BIN (tooltip)->child; + if (child) + gtk_container_propagate_expose (GTK_CONTAINER (tooltip), child, event); + return TRUE; +} + +static void ygtk_tooltip_box_class_init (YGtkTooltipBoxClass *klass) +{ + ygtk_tooltip_box_parent_class = g_type_class_peek_parent (klass); + + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + widget_class->expose_event = ygtk_tooltip_box_expose_event; +} + +static GtkWidget *ygtk_tooltip_box_new (void) +{ return (GtkWidget *) g_object_new (ygtk_tooltip_box_get_type(), NULL); } + +// stack (or deck) widget + class StackWidget { GtkWidget *m_combo, *m_placeholder, *m_widget; @@ -3014,7 +3057,7 @@ else { m_combo = gtk_combo_box_new_text(); m_placeholder = gtk_event_box_new(); - m_widget = gtk_vbox_new (FALSE, 2); + m_widget = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (m_widget), m_combo, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (m_widget), m_placeholder, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (m_combo), "changed", @@ -3071,7 +3114,7 @@ m_list_widget = list_widget; m_widget = gtk_vbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (m_widget), 12); + gtk_container_set_border_width (GTK_CONTAINER (m_widget), 12); // FIXME: are these the inner borders? g_signal_connect (G_OBJECT (m_widget), "expose-event", G_CALLBACK (paint_white_expose_cb), NULL); @@ -3238,6 +3281,122 @@ } }; +class UndoBox : public Ypp::PkgList::Listener +{ +GtkWidget *m_undo_box, *m_undo_package, *m_undo_details; +Ypp::PkgList m_pool; +Ypp::Package *m_package; + +public: + GtkWidget *getWidget() + { return m_undo_box; } + + UndoBox() + { + Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); +// if (pkg_selector->onlineUpdateMode()) + m_pool = Ypp::PkgQuery (Ypp::Package::PACKAGE_TYPE, query); + // TODO: there could already be packages modified + m_pool.addListener (this); + + m_undo_box = ygtk_tooltip_box_new(); + GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_add (GTK_CONTAINER (m_undo_box), vbox); + GtkWidget *title = gtk_label_new (_("Software changes")); + gtk_misc_set_alignment (GTK_MISC (title), 0, .5); + YGUtils::setWidgetFont (title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + gtk_box_pack_start (GTK_BOX (vbox), title, FALSE, TRUE, 0); + GtkWidget *package_box = gtk_hbox_new (FALSE, 4); + m_undo_package = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_undo_package), 0, .5); + GtkWidget *undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO); + g_signal_connect (G_OBJECT (undo_button), "clicked", + G_CALLBACK (undo_clicked_cb), this); + gtk_box_pack_start (GTK_BOX (package_box), m_undo_package, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (package_box), undo_button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), package_box, FALSE, TRUE, 6); + m_undo_details = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_undo_details), 0, .5); + gtk_box_pack_start (GTK_BOX (vbox), m_undo_details, FALSE, TRUE, 0); + GtkWidget *details_button = gtk_link_button_new (_("View details...")); + GtkWidget *details_align = gtk_alignment_new (1, .5, 0, 0); + gtk_container_add (GTK_CONTAINER (details_align), details_button); + gtk_box_pack_start (GTK_BOX (vbox), details_align, FALSE, TRUE, 0); + } + + ~UndoBox() + { + m_pool.removeListener (this); + } + + void startHack() // call after init, after you did a show_all in the dialog + { gtk_widget_hide (m_undo_box); } + + void setPackage (Ypp::Package *package) + { + m_package = package; + + std::string action; + if (package->toInstall()) { + if (package->isInstalled()) + action = _("upgrade"); + else + action = _("add"); + } + else //if (package->toRemove()) + action = _("remove"); + + gchar *package_str = g_strdup_printf ("%s %s", action.c_str(), package->name().c_str()); + gtk_label_set_text (GTK_LABEL (m_undo_package), package_str); + g_free (package_str); + + const Ypp::PkgList packages (Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE)); + int added = 0, removed = 0; + for (int i = 0; i < packages.size(); i++) { + if (packages.get (i)->toInstall()) + added++; + if (packages.get (i)->toRemove()) + removed++; + } + + std::string delta_str; + Ypp::Disk *disk = Ypp::get()->getDisk(); + for (int i = 0; disk->getPartition (i); i++) { + const Ypp::Disk::Partition *part = disk->getPartition (i); + if (part->path == "/usr" || part->path == "/usr/" || part->path == "/") + delta_str = part->delta_str; + } + + gchar *added_str = 0, *removed_str = 0; + if (added) + added_str = g_strdup_printf (_("Added %d packages\n"), added); + if (removed) + removed_str = g_strdup_printf (_("Removed %d packages\n"), removed); + + gchar *details = g_strdup_printf (_("%s%sTotalling: %s"), added_str ? added_str : "", removed_str ? removed_str : "", delta_str.c_str()); + gtk_label_set_text (GTK_LABEL (m_undo_details), details); + g_free (details); + if (added_str) + g_free (added_str); + if (removed_str) + g_free (removed_str); + + gtk_widget_show (m_undo_box); + } + + virtual void entryInserted (const Ypp::PkgList list, int index, Ypp::Package *package) + { setPackage (package); } + + virtual void entryDeleted (const Ypp::PkgList list, int index, Ypp::Package *package) + { gtk_widget_hide (m_undo_box); } + + virtual void entryChanged (const Ypp::PkgList list, int index, Ypp::Package *package) {} + + static void undo_clicked_cb (GtkButton *button, UndoBox *pThis) + { pThis->m_package->undo(); } +}; + class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener { GtkWidget *m_widget, *m_disk_label, *m_arrange_combo; @@ -3248,6 +3407,7 @@ StartupMenu *m_startup_menu; Ypp::Package::Type m_type; Toolbar *m_toolbar; +UndoBox *m_undo_box; public: GtkWidget *getWidget() { return m_widget; } @@ -3503,6 +3663,12 @@ gtk_box_pack_start (GTK_BOX (side_vbox), vpaned, TRUE, TRUE, 0); } + m_undo_box = 0; + if (undo_box) { + m_undo_box = new UndoBox(); + gtk_box_pack_start (GTK_BOX (side_vbox), m_undo_box->getWidget(), FALSE, TRUE, 0); + } + GtkWidget *side_pane = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (side_pane), side_vbox, FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (side_pane), view_pane, TRUE, FALSE); @@ -3525,6 +3691,8 @@ gtk_widget_hide (side_vbox); if (changes_pane) changes_pane->startHack(); + if (m_undo_box) + m_undo_box->startHack(); if (startup_menu) { m_startup_menu = new StartupMenu (m_widget); @@ -3549,6 +3717,7 @@ delete *it; delete m_disk; delete m_startup_menu; + delete m_undo_box; } private: @@ -3765,7 +3934,41 @@ #if 0 m_tools = new ToolsBox(); - ygtk_wizard_set_extra_button (YGTK_WIZARD (getWidget()), m_tools->getWidget()); + ygtk_wizard_set_extra_button (wizard, m_tools->getWidget()); +#endif + +#if 0 + GtkWidget *menu_bar = gtk_menu_bar_new(), *item, *submenu, *subitem; + item = gtk_menu_item_new_with_label (_("File")); + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); + subitem = gtk_menu_item_new_with_label (_("Import...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (import_file_cb), this); + subitem = gtk_menu_item_new_with_label (_("Export...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (export_file_cb), this); + subitem = gtk_separator_menu_item_new(); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + subitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + subitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + item = gtk_menu_item_new_with_label (_("View")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + item = gtk_menu_item_new_with_label (_("Tools")); + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); + subitem = gtk_menu_item_new_with_label (_("Generate Dependency Testcase...")); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), subitem); + g_signal_connect (G_OBJECT (subitem), "activate", + G_CALLBACK (create_solver_testcase_cb), this); + gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), item); + gtk_widget_show_all (menu_bar); + ygtk_wizard_set_custom_menu (wizard, menu_bar); #endif m_progressbar = gtk_progress_bar_new(); Modified: trunk/gtk/src/pkg/ygtkpackageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpackageview.cc Sat Jan 16 17:17:07 2010 @@ -728,10 +728,10 @@ clear(); if (action_col) { - if (action_col_as_check) - appendCheckColumn ("is-installed"); //("to-install"); - else //if (action_col_as_button) + if (action_col_as_button) appendButtonColumn (NULL, "to-install"); + else //if (action_col_as_check) + appendCheckColumn ("is-installed"); //("to-install"); } if (status_col) appendIconColumn (NULL, "icon"); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=60408&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sat Jan 16 17:17:07 2010 @@ -920,19 +920,17 @@ { if (!wizard->menu) { wizard->menu = gtk_menu_bar_new(); - gtk_container_add (GTK_CONTAINER (wizard->m_menu_box), wizard->menu); - // we probably want to hide the title, so the menu is more visible - gtk_widget_hide (wizard->m_title); + ygtk_wizard_set_custom_menu (wizard, wizard->menu); + gtk_widget_show (wizard->menu); } GtkWidget *entry = gtk_menu_item_new_with_mnemonic (text); - gtk_menu_shell_append (GTK_MENU_SHELL (wizard->menu), entry); - GtkWidget *submenu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM (entry), submenu); + gtk_menu_shell_append (GTK_MENU_SHELL (wizard->menu), entry); + gtk_widget_show_all (entry); g_hash_table_insert (wizard->menu_ids, g_strdup (id), submenu); - gtk_widget_show_all (wizard->m_menu_box); } gboolean ygtk_wizard_add_menu_entry (YGtkWizard *wizard, const char *parent_id, @@ -970,13 +968,12 @@ return FALSE; GtkWidget *entry = gtk_menu_item_new_with_mnemonic (text); - gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); - GtkWidget *submenu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM (entry), submenu); + gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); + gtk_widget_show_all (entry); g_hash_table_insert (wizard->menu_ids, g_strdup (id), submenu); - gtk_widget_show_all (entry); return TRUE; } @@ -1004,6 +1001,14 @@ } } +void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar) +{ + gtk_container_add (GTK_CONTAINER (wizard->m_menu_box), menu_bar); + gtk_widget_show (wizard->m_menu_box); + // we probably want to hide the title, so the menu is more visible + gtk_widget_hide (wizard->m_title); +} + void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text) { g_return_if_fail (wizard->steps != NULL); Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=60408&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Sat Jan 16 17:17:07 2010 @@ -162,6 +162,7 @@ const char *text, const char *id); gboolean ygtk_wizard_add_menu_separator (YGtkWizard *wizard, const char *parent_id); void ygtk_wizard_clear_menu (YGtkWizard *wizard); +void ygtk_wizard_set_custom_menu (YGtkWizard *wizard, GtkWidget *menu_bar); void ygtk_wizard_add_step_header (YGtkWizard *wizard, const char *text); void ygtk_wizard_add_step (YGtkWizard *wizard, const char* text, const char *id); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60407 - /trunk/storage/storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 18:51:27 2010 New Revision: 60407 URL: http://svn.opensuse.org/viewcvs/yast?rev=60407&view=rev Log: - show name instead of device in bargraph of disks/vgs Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Fri Jan 15 18:51:27 2010 @@ -387,7 +387,7 @@ float tmp = (float) Region::Length(region) / (float) disk["cyl_count"]:1; y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl); - AddSegment(tmp, part["device"]:"", part["size_k"]:0); + AddSegment(tmp, part["name"]:"", part["size_k"]:0); // Now there is some xtra space between the end of this partition and the start of the next one // or the end of the disk if @@ -417,7 +417,7 @@ foreach(map partition, partitions, { integer size_k = partition["size_k"]:0; disk_free_k = disk_free_k - size_k; - AddSegment((float) size_k / (float) disk_size_k, partition["device"]:"", size_k); + AddSegment((float) size_k / (float) disk_size_k, partition["name"]:"", size_k); }); if (disk_free_k > 0) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60406 - /tags/stable-2_19_2/installation/
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 17:31:52 2010 New Revision: 60406 URL: http://svn.opensuse.org/viewcvs/yast?rev=60406&view=rev Log: Created tag stable-2_19_2 for installation Added: tags/stable-2_19_2/installation/ - copied from r60405, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60405 - in /trunk/installation: VERSION control/control.rnc package/yast2-installation.changes
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 17:31:00 2010 New Revision: 60405 URL: http://svn.opensuse.org/viewcvs/yast?rev=60405&view=rev Log: - updated control.rnc Modified: trunk/installation/VERSION trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=60405&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Jan 15 17:31:00 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc… ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Fri Jan 15 17:31:00 2010 @@ -350,6 +350,7 @@ | boot_evms | use_separate_multipath_module | prefer_remove + | vm_keep_unpartitioned_region | remove_special_partitions | partitions @@ -366,6 +367,7 @@ boot_evms = element boot_evms { BOOLEAN } prefer_remove = element prefer_remove { BOOLEAN } remove_special_partitions = element remove_special_partitions { BOOLEAN } +vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN } # used by HASI Add-On use_separate_multipath_module = element use_separate_multipath_module { BOOLEAN } Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 15 17:31:00 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 17:29:45 CET 2010 - aschnell(a)suse.de + +- updated control.rnc +- 2.19.2 + +------------------------------------------------------------------- Thu Jan 7 15:29:13 CET 2010 - jsuchome(a)suse.cz - inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60404 - in /branches/tmp/bubli/libyui: VERSION package/libyui.changes
by mvidner＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mvidner Date: Fri Jan 15 17:16:43 2010 New Revision: 60404 URL: http://svn.opensuse.org/viewcvs/yast?rev=60404&view=rev Log: Bumped the version. Otherwise the 'Obsoletes: yast2-libyui < %version' cannot take effect. Modified: branches/tmp/bubli/libyui/VERSION branches/tmp/bubli/libyui/package/libyui.changes Modified: branches/tmp/bubli/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/VERSION?rev=… ============================================================================== --- branches/tmp/bubli/libyui/VERSION (original) +++ branches/tmp/bubli/libyui/VERSION Fri Jan 15 17:16:43 2010 @@ -1 +1 @@ -2.18.8 +2.18.9 Modified: branches/tmp/bubli/libyui/package/libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/package/liby… ============================================================================== --- branches/tmp/bubli/libyui/package/libyui.changes (original) +++ branches/tmp/bubli/libyui/package/libyui.changes Fri Jan 15 17:16:43 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 15 17:07:32 CET 2010 - kmachalkova(a)suse.cz + +- Renamed yast2-libyui to libyui to further the independence from + YaST +- V 2.18.9 + +------------------------------------------------------------------- Tue Jul 28 17:22:58 CEST 2009 - kmachalkova(a)suse.cz - Search for icons in several possible directories (using -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60403 - in /trunk/storage/storage/src/include: ep-all.ycp ep-dialogs.ycp ep-hd-lib.ycp ep-lvm-lib.ycp ep-raid-lib.ycp ep-unused.ycp
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 16:17:32 2010 New Revision: 60403 URL: http://svn.opensuse.org/viewcvs/yast?rev=60403&view=rev Log: - tiny modernisations Modified: trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/include/ep-unused.ycp Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Fri Jan 15 16:17:32 2010 @@ -71,7 +71,7 @@ configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); } - if (size(configs) > 0) { + if (!isempty(configs)) { // menu button text buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); } Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Jan 15 16:17:32 2010 @@ -592,7 +592,7 @@ if (used_fs != `swap) { map free_data = Storage::GetFreeSpace(device, used_fs, true); - if (size(free_data) == 0 || !free_data["ok"]:false) + if (isempty(free_data) || !free_data["ok"]:false) { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); //FIXME: Really? Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Fri Jan 15 16:17:32 2010 @@ -373,19 +373,20 @@ more partitions. After cloning, these partitions will be deleted.</p>"); - list <string> AvailableTargetDisks() { - list <string> items = []; - + list <string> AvailableTargetDisks() + { map <string, map> filtered_target_map = filter( string dev, map props, target_map, { - return ( dev != device && - Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && - props["used_by_device"]:"" == "" && - props["cyl_size"]:0 == mycyl_size ); + return dev != device && + Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && + isempty(props["used_by"]:[]) && + props["cyl_size"]:0 == mycyl_size; }); y2milestone("Available, suitable and unused disks (other than %1): %2", device, Map::Keys(filtered_target_map)); + list <string> items = []; + foreach( string dev, map props, filtered_target_map,{ if( props["size_k"]:0 >= mysize ) items = add(items, dev); Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Fri Jan 15 16:17:32 2010 @@ -42,7 +42,7 @@ void EpCreateVolumeGroup() { map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by_device"]:""); }); + list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by"]:[]); }); if (size(unused_pvs) < 1) { Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Fri Jan 15 16:17:32 2010 @@ -42,7 +42,7 @@ void EpCreateRaid() { map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by_device"]:""); }); + list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by"]:[]); }); if (size(unused_devices) < 2) { Modified: trunk/storage/storage/src/include/ep-unused.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-u… ============================================================================== --- trunk/storage/storage/src/include/ep-unused.ycp (original) +++ trunk/storage/storage/src/include/ep-unused.ycp Fri Jan 15 16:17:32 2010 @@ -20,8 +20,8 @@ if (partition == nil) { - if (disk["partitions"]:[] == [] && - disk["used_by_type"]:`UB_NONE == `UB_NONE) + if (isempty(disk["partitions"]:[]) && + isempty(disk["used_by"]:[])) { return `show; } @@ -31,8 +31,8 @@ else { if (partition["type"]:`primary != `extended && - partition["mount"]:"" == "" && - partition["used_by_type"]:`UB_NONE == `UB_NONE) + isempty(partition["mount"]:"") && + isempty(partition["used_by"]:[])) { return `show; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0