Author: rpmcruz Date: Fri Dec 10 00:37:38 2010 New Revision: 62984 URL: http://svn.opensuse.org/viewcvs/yast?rev=62984&view=rev Log: Milestone version. Modified: trunk/gtk/ChangeLog trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGComboBox.cc trunk/gtk/src/YGDialog.cc trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/YGPackageSelector.h trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Dec 10 00:37:38 2010 @@ -1,5 +1,10 @@ 2010-12-09 Ricardo Cruz + * src/YGComboBox.cc: bug fix 655977: don't layout + combo-box popup menu as a table. + +2010-12-09 Ricardo Cruz + * src/pkg/yzyppwrapper.cc: bug fix: when sorting equal attributes maintain previous arranging order. Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Dec 10 00:37:38 2010 @@ -1 +1 @@ -2.21.82 +2.21.83 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Dec 10 00:37:38 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "82") +SET(VERSION_PATCH "83") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Dec 10 00:37:38 2010 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Dec 09 23:33:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.83 +- fix: can't use combo-box popup menu when items are too +long (bnc#595560). +- table fix: not showing all popup entries on right-click. +- log view fix: fixed flickering, and allow user to freely +scroll. +- sw_single: use same height for "all packages" item, and +keep items sorted by name when sorting by status or another +column. + +------------------------------------------------------------------- Wed Nov 10 18:07:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt - 2.21.82 Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Fri Dec 10 00:37:38 2010 @@ -21,10 +21,9 @@ { gtk_combo_box_set_model (getComboBox(), getModel()); GtkCellRenderer* cell; - if (editable) { + if (editable) gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (getWidget()), YGSelectionModel::LABEL_COLUMN); - } else { cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (getWidget()), cell, TRUE); @@ -37,9 +36,6 @@ "pixbuf", YGSelectionModel::ICON_COLUMN, NULL); connect (getWidget(), "changed", G_CALLBACK (selected_changed_cb), this); - // realize doesn't seem reliable -- expose then disconnect - g_signal_connect (G_OBJECT (getWidget()), "expose-event", - G_CALLBACK (realize_cb), this); } inline GtkComboBox *getComboBox() @@ -130,19 +126,6 @@ static void selected_changed_cb (GtkComboBox *widget, YGComboBox *pThis) { pThis->emitEvent (YEvent::ValueChanged); } - static gboolean realize_cb (GtkWidget *widget, GdkEventExpose *event, - YGComboBox *pThis) - { - // some combo boxes have too many items -- wrap the thing in columns - int rows; - pThis->getMaxDepth (&rows); - int cols = MIN (rows / 20, 5) + 1; - if (cols > 1) // this changes the popup width, so only set it for cols > 1 - gtk_combo_box_set_wrap_width (pThis->getComboBox(), cols); - g_signal_handlers_disconnect_by_func (widget, (gpointer) realize_cb, pThis); - return FALSE; - } - YGLABEL_WIDGET_IMPL (YComboBox) YGSELECTION_WIDGET_IMPL (YComboBox) }; Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Dec 10 00:37:38 2010 @@ -25,7 +25,7 @@ //#define DEFAULT_WIDTH 750 //#define DEFAULT_HEIGHT 650 -#define DEFAULT_CHAR_WIDTH 65 +#define DEFAULT_CHAR_WIDTH 62 #define DEFAULT_CHAR_HEIGHT 28 #define DEFAULT_PIXEL_WIDTH 350 #define DEFAULT_PIXEL_HEIGHT 200 Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Fri Dec 10 00:37:38 2010 @@ -17,7 +17,7 @@ ygtkpkgsearchentry.cc ygtkpkgstatusbar.cc ygtkpkgundolist.cc - ygtkpkgvestigialdialog.cc + #ygtkpkgvestigialdialog.cc yzypptags.cc yzyppwrapper.cc Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Dec 10 00:37:38 2010 @@ -28,7 +28,9 @@ #include "ygtkpkgdetailview.h" #include "ygtkpkghistorydialog.h" +#ifdef HAS_VESTIGIAL_DIALOG #include "ygtkpkgvestigialdialog.h" +#endif //#define USE_LIST_BUTTONS @@ -657,7 +659,10 @@ YGPackageSelector::YGPackageSelector (YWidget *parent, long mode) : YPackageSelector (NULL, mode), YGWidget (this, parent, YGTK_TYPE_WIZARD, NULL), -m_historyDialog (NULL), m_vestigialDialog (NULL) +m_historyDialog (NULL) +#ifdef HAS_VESTIGIAL_DIALOG +, m_vestigialDialog (NULL) +#endif { singleton = this; setBorder (0); @@ -713,7 +718,10 @@ YGPackageSelector::~YGPackageSelector() { - delete m_historyDialog; delete m_vestigialDialog; + delete m_historyDialog; +#ifdef HAS_VESTIGIAL_DIALOG + delete m_vestigialDialog; +#endif delete impl; singleton = 0; } @@ -783,12 +791,14 @@ m_historyDialog->popup(); } +#ifdef HAS_VESTIGIAL_DIALOG void YGPackageSelector::showVestigialDialog() { if (!m_vestigialDialog) m_vestigialDialog = new YGtkPkgVestigialDialog(); m_vestigialDialog->popup(); } +#endif YGtkPkgUndoList *YGPackageSelector::undoList() { return impl->m_undo; } Modified: trunk/gtk/src/pkg/YGPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.h?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.h (original) +++ trunk/gtk/src/pkg/YGPackageSelector.h Fri Dec 10 00:37:38 2010 @@ -13,6 +13,8 @@ #include "YGWidget.h" #include "yzyppwrapper.h" +//#define HAS_VESTIGIAL_DIALOG + struct YGtkPkgUndoList; struct YGtkPkgSearchEntry; struct YGtkPkgHistoryDialog; @@ -36,7 +38,9 @@ void showRepoManager(); void showHistoryDialog(); +#ifdef HAS_VESTIGIAL_DIALOG void showVestigialDialog(); +#endif YGtkPkgUndoList *undoList(); YGtkPkgSearchEntry *getSearchEntry(); @@ -55,7 +59,9 @@ static YGPackageSelector *singleton; YGtkPkgHistoryDialog *m_historyDialog; +#ifdef HAS_VESTIGIAL_DIALOG YGtkPkgVestigialDialog *m_vestigialDialog; +#endif }; #endif Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Dec 10 00:37:38 2010 @@ -397,7 +397,7 @@ gtk_box_pack_start (GTK_BOX (box), versions_box, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, TRUE, 0); -#if 0 // draw border all around +#if 1 // draw border all around GtkWidget *frame = gtk_frame_new (NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 2); gtk_container_add (GTK_CONTAINER (frame), box); Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?rev=62984&r1=62983&r2=62984&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Dec 10 00:37:38 2010 @@ -658,8 +658,10 @@ static void show_log_changes_cb() { YGPackageSelector::get()->showHistoryDialog(); } +#ifdef HAS_VESTIGIAL_DIALOG static void show_vestigial_packages_cb() { YGPackageSelector::get()->showVestigialDialog(); } +#endif static void reset_ignored_dependency_conflicts_cb() { zypp::getZYpp()->resolver()->undo(); } @@ -733,8 +735,10 @@ if (!selector->onlineUpdateMode()) { append_menu_item (submenu, _("Show _History"), NULL, G_CALLBACK (show_log_changes_cb), this); +#ifdef HAS_VESTIGIAL_DIALOG append_menu_item (submenu, _("Show _Unneeded Dependencies"), NULL, G_CALLBACK (show_vestigial_packages_cb), this); +#endif } append_menu_item (submenu, NULL, NULL, NULL, NULL); // Translators: keep "-_devel" untranslated -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org