December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59873 - /tags/branch-Code-11-SP1-2_17_5/live-installer/
by jsrain＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: jsrain Date: Tue Dec 1 12:30:50 2009 New Revision: 59873 URL: http://svn.opensuse.org/viewcvs/yast?rev=59873&view=rev Log: Created tag branch-Code-11-SP1-2_17_5 for live-installer Added: tags/branch-Code-11-SP1-2_17_5/live-installer/ (props changed) - copied from r59872, branches/SuSE-Code-11-SP1-Branch/live-installer/ -- 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] r59872 - in /branches/SuSE-Code-11-SP1-Branch/live-installer: VERSION package/yast2-live-installer.changes src/live-installer.ycp
by jsrain＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: jsrain Date: Tue Dec 1 12:30:45 2009 New Revision: 59872 URL: http://svn.opensuse.org/viewcvs/yast?rev=59872&view=rev Log: bump fixed missing module name Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/VERSION branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/VERSION Tue Dec 1 12:30:45 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Tue Dec 1 12:30:45 2009 @@ -8,6 +8,7 @@ (bnc #450228) - adapted for unified progress during live installation (bnc#435680) +- 2.17.5 ------------------------------------------------------------------- Tue Aug 11 13:01:49 CEST 2009 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Tue Dec 1 12:30:45 2009 @@ -32,7 +32,7 @@ if ($[] != (map)SCR::Read (.target.stat, LiveInstaller::live_control_file)) { ProductControl::custom_control_file = LiveInstaller::live_control_file; // replace general control file because of 2nd stage - integer cpres = (integer)SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", live_control_file, "/etc/YaST2/control.xml")); + integer cpres = (integer)SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", LiveInstaller::live_control_file, "/etc/YaST2/control.xml")); if (cpres != 0) { Report::Error (_("Failed to update the control file for the second stage of the 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] r59871 - /tags/stable-2_19_4/network/
by mzugec＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: mzugec Date: Tue Dec 1 11:26:15 2009 New Revision: 59871 URL: http://svn.opensuse.org/viewcvs/yast?rev=59871&view=rev Log: Created tag stable-2_19_4 for network Added: tags/stable-2_19_4/network/ - copied from r59870, trunk/network/ -- 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] r59870 - in /trunk/network: VERSION package/yast2-network.changes src/modules/ISDN.ycp
by mzugec＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: mzugec Date: Tue Dec 1 11:26:00 2009 New Revision: 59870 URL: http://svn.opensuse.org/viewcvs/yast?rev=59870&view=rev Log: ISDN: fixed creating configuration with incorrect name (bnc#534504) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/ISDN.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=59870&r1=598… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Dec 1 11:26:00 2009 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Dec 1 11:26:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 1 11:24:25 CET 2009 - mzugec(a)suse.de + +- ISDN: fixed creating configuration with incorrect name (bnc#534504) +- 2.19.4 + +------------------------------------------------------------------- Fri Nov 27 13:20:10 CET 2009 - mzugec(a)suse.cz - fixed prefixlen validation Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev… ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Tue Dec 1 11:26:00 2009 @@ -795,13 +795,14 @@ */ global define boolean AddIf(string proto) ``{ type = "net"; - device = GetFreeDevice(type); + device = sformat("%1%2", type, GetFreeDevice(type)); interface = $[ "PROTOCOL": proto, "USERCONTROL": "yes", ]; interface = set_ifparameters (interface); operation = `addif; + y2milestone("Adding network configuration %1", device); return true; } -- 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] r59869 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPackageSelector.cc src/YQPkgVersionsView.cc
by tgoettlicher＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: tgoettlicher Date: Tue Dec 1 10:36:01 2009 New Revision: 59869 URL: http://svn.opensuse.org/viewcvs/yast?rev=59869&view=rev Log: - fixed bnc #554473: UTF-8 Problem - fixed bnc #558881: Broken accented chars in YaST Qt packager versions tab Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgVersionsView.cc 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 Tue Dec 1 10:36:01 2009 @@ -2,6 +2,8 @@ Tue Dec 1 10:13:02 CET 2009 - tgoettlicher(a)suse.de - fixed bnc #549868: Mnemonic clash in Software Management +- fixed bnc #554473: UTF-8 Problem +- fixed bnc #558881: Broken accented chars in YaST Qt packager versions tab ------------------------------------------------------------------- Thu Nov 19 14:15:03 CET 2009 - tgoettlicher(a)suse.de 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 Tue Dec 1 10:36:01 2009 @@ -1393,7 +1393,10 @@ // repository if there is a job for it if ( zypp::getZYpp()->resolver()->upgradingRepo(repo) ) { - _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } @@ -1409,7 +1412,10 @@ ! repo.isSystemRepo() && _repoFilterView->selectedRepo() == repo ) { - _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } _repoUpgradeLabel->setVisible(!_repoUpgradeLabel->text().isEmpty() && Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Tue Dec 1 10:36:01 2009 @@ -146,7 +146,7 @@ font.setPixelSize( (int) ( fm.height() * 1.1 ) ); pkgNameLabel->setFont( font ); - pkgNameLabel->setText( selectable->theObj()->name().c_str() ); + pkgNameLabel->setText( fromUTF8(selectable->theObj()->name().c_str()) ); // New scope { @@ -193,9 +193,9 @@ while ( it != selectable->installedEnd() ) { QString text = _( "%1-%2 from vendor %3 (installed)" ) - .arg( (*it)->edition().asString().c_str() ) - .arg( (*it)->arch().asString().c_str() ) - .arg( (*it)->vendor().c_str() ) ; + .arg( fromUTF8( (*it)->edition().asString().c_str() ) ) + .arg( fromUTF8( (*it)->arch().asString().c_str() ) ) + .arg( fromUTF8( (*it)->vendor().c_str() ) ) ; QWidget * installedVersion = new QWidget( this ); QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); @@ -347,11 +347,11 @@ // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ // %1 %2 %3 %4 %5 setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) + .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() ) ); + .arg( fromUTF8( zyppObj->vendor().c_str() ) ) ); } @@ -383,11 +383,11 @@ , _zyppObj( zyppObj ) { setText (_( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) + .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() )); + .arg( fromUTF8( zyppObj->vendor().c_str() ) )); connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); -- 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] r59868 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPackageSelector.cc src/YQPkgGenericDetailsView.h src/YQPkgVersionsView.cc src/YQPkgVersionsView.h
by tgoettlicher＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: tgoettlicher Date: Tue Dec 1 10:14:49 2009 New Revision: 59868 URL: http://svn.opensuse.org/viewcvs/yast?rev=59868&view=rev Log: fixed bnc #549868 prepared for multiversion install Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgGenericDetailsView.h trunk/qt-pkg/src/YQPkgVersionsView.cc trunk/qt-pkg/src/YQPkgVersionsView.h 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 Tue Dec 1 10:14:49 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 1 10:13:02 CET 2009 - tgoettlicher(a)suse.de + +- fixed bnc #549868: Mnemonic clash in Software Management + +------------------------------------------------------------------- Thu Nov 19 14:15:03 CET 2009 - tgoettlicher(a)suse.de - fixed orphaned packages View (bnc #551771) @@ -209,7 +214,7 @@ ------------------------------------------------------------------- Fri Jan 9 18:52:44 CET 2009 - sh(a)suse.de -- Fixed accumulated margins in "Versions" view for installed +- Fixed accmulated margins in "Versions" view for installed ------------------------------------------------------------------- Fri Jan 9 17:59:43 CET 2009 - sh(a)suse.de 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 Tue Dec 1 10:14:49 2009 @@ -524,6 +524,9 @@ connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgVersionsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); + connect( _pkgList, SIGNAL( statusChanged() ), + _pkgVersionsView, SLOT ( slotRefreshDetails() ) ); + // // File List @@ -733,7 +736,7 @@ _configMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _configMenu ); action = _menuBar->addMenu( _configMenu ); - action->setText(_( "&Configuration" )); + action->setText(_( "Confi&guration" )); _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); _configMenu->addAction( _( "&Online Update..." ), this, SLOT( onlineUpdateConfiguration() ), Qt::CTRL + Qt::Key_O ); _configMenu->addAction( _( "Search Packages on &Web..." ), this, SLOT( webpinSearch() ), Qt::CTRL + Qt::Key_W ); Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgGenericDetailsVi… ============================================================================== --- trunk/qt-pkg/src/YQPkgGenericDetailsView.h (original) +++ trunk/qt-pkg/src/YQPkgGenericDetailsView.h Tue Dec 1 10:14:49 2009 @@ -124,6 +124,7 @@ **/ virtual void showDetails( ZyppSel selectable ) = 0; + protected slots: Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Tue Dec 1 10:14:49 2009 @@ -73,10 +73,22 @@ void +YQPkgVersionsView::slotRefreshDetails( ) +{ + if ( !_selectable ) + return; + + showDetailsIfVisible ( _selectable ); +} + + +void YQPkgVersionsView::showDetailsIfVisible( ZyppSel selectable ) { _selectable = selectable; + yuiMilestone() << "showDetailsIfVis" << endl; + if ( _parentTab ) // Is this view embedded into a tab widget? { if ( _parentTab->currentWidget() == this ) // Is this page the topmost? @@ -92,6 +104,8 @@ void YQPkgVersionsView::showDetails( ZyppSel selectable ) { + yuiMilestone() << "showDetails" << endl; + _selectable = selectable; if ( ! selectable ) @@ -480,6 +494,7 @@ } // setStatusIcon(); +// emit candidateChanged( ); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.h (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.h Tue Dec 1 10:14:49 2009 @@ -82,6 +82,7 @@ **/ void reload( QWidget * newCurrent ); + void slotRefreshDetails(); signals: @@ -224,6 +225,7 @@ void slotIconClicked(); + }; -- 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] r59867 - in /trunk/gtk: ChangeLog src/YGUtils.cc src/YGUtils.h src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: rpmcruz Date: Tue Dec 1 04:30:59 2009 New Revision: 59867 URL: http://svn.opensuse.org/viewcvs/yast?rev=59867&view=rev Log: * src/YGUtils.h/cc & src/ygtkwizard.c: map stock icons to menu items (try autoyast). Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=59867&r1=59866… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Dec 1 04:30:59 2009 @@ -11,6 +11,9 @@ * src/YGPackageSelector.cc: partial bug fix for 548437: honor a couple of the flags. + * src/YGUtils.h/cc & src/ygtkwizard.c: map stock icons + to menu items (try autoyast). + 2009-11-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: added support for Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=59867&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Tue Dec 1 04:30:59 2009 @@ -573,8 +573,7 @@ str.erase (str.size()-1, 1); } -const char *YGUtils::setStockIcon (GtkWidget *button, const std::string &label, - const char *fallbackIcon) +const char *YGUtils::mapStockIcon (const std::string &label) { static bool firstTime = true; static std::map <std::string, std::string> stockMap; if (firstTime) { @@ -591,6 +590,8 @@ _id = GTK_STOCK_GO_FORWARD; else if (!strcmp (id, GTK_STOCK_MEDIA_PREVIOUS) || !strcmp (id, GTK_STOCK_MEDIA_REWIND)) _id = GTK_STOCK_GO_BACK; + else if (!strcmp (id, GTK_STOCK_MEDIA_RECORD)) + _id = GTK_STOCK_SAVE; stockMap[cutUnderline (item.label)] = _id; } // some may not have a stock item because they can't be set on a label @@ -612,6 +613,7 @@ stockMap [_("Down")] = GTK_STOCK_GO_DOWN; stockMap [_("Enable")] = GTK_STOCK_YES; stockMap [_("Disable")] = GTK_STOCK_NO; + stockMap [_("Exit")] = GTK_STOCK_QUIT; } std::string id = cutUnderline (label); @@ -621,17 +623,21 @@ std::map <std::string, std::string>::const_iterator it; it = stockMap.find (id); - bool foundIcon = it != stockMap.end(); - const char *icon = NULL; - if (foundIcon) - icon = it->second.c_str(); - else if (id.size() < 22) + if (it != stockMap.end()) + return it->second.c_str(); + return NULL; +} + +const char *YGUtils::setStockIcon (GtkWidget *button, const std::string &label, + const char *fallbackIcon) +{ + const char *icon = mapStockIcon (label); + if (!icon && label.size() < 22) icon = fallbackIcon; if (icon) { if (gtk_style_lookup_icon_set (button->style, icon)) { // we want to use GtkImage stock mode so it honors sensitive GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); gtk_button_set_image (GTK_BUTTON (button), image); } } @@ -640,10 +646,9 @@ if (image) gtk_widget_hide (image); } - return foundIcon ? icon : NULL; + return icon; } - /* * construct a help string by dropping the title, and mentioning * the first sentence for a dialog sub-title @@ -712,6 +717,9 @@ return g_string_free (str, FALSE); } +const char *ygutils_mapStockIcon (const char *label) +{ return YGUtils::mapStockIcon (label); } + const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallback) { return YGUtils::setStockIcon (button, label, fallback); } Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=59867&r1=5… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Tue Dec 1 04:30:59 2009 @@ -49,6 +49,7 @@ GdkPixbuf *setOpacity (const GdkPixbuf *src, int opacity, bool touchAlpha); /* Tries to make sense out of the string, applying some stock icon to the button. */ + const char *mapStockIcon (const std::string &label); const char *setStockIcon (GtkWidget *button, const std::string &label, const char *fallbackIcon); }; @@ -60,6 +61,7 @@ void ygutils_scrollAdj (GtkAdjustment *vadj, gboolean top); + const char *ygutils_mapStockIcon (const char *label); const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=59867&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Dec 1 04:30:59 2009 @@ -27,6 +27,7 @@ // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); +extern const char *ygutils_mapStockIcon (const char *label); extern const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); extern GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean alpha); @@ -942,7 +943,15 @@ if (!parent) return FALSE; - GtkWidget *entry = gtk_menu_item_new_with_mnemonic (text); + GtkWidget *entry; + const char *icon = ygutils_mapStockIcon (text); + if (icon) { + GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU); + entry = gtk_image_menu_item_new_with_mnemonic (text); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (entry), image); + } + else + entry = gtk_menu_item_new_with_mnemonic (text); gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); gtk_widget_show (entry); -- 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] r59866 - in /trunk/gtk: ./ src/ src/pkg/
by rpmcruz＠svn.opensuse.org 01 Dec '09

01 Dec '09

Author: rpmcruz Date: Tue Dec 1 03:56:40 2009 New Revision: 59866 URL: http://svn.opensuse.org/viewcvs/yast?rev=59866&view=rev Log: * src/YGUtils.cc: bug fix 559226: Allow '&' to be escaped. * src/YGPushButton.cc: bug fix 558900. Default button state forgotten. * src/YGTable.cc: bug fix 548058: Default button state forgotten. * src/YGPackageSelector.cc: partial bug fix for 548437: honor a couple of the flags. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGFrame.cc trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/YGPushButton.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.h trunk/gtk/src/YGUtils.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/YGPackageSelectorPluginImpl.h trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/ygtklinklabel.h trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=59866&r1=59865… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Dec 1 03:56:40 2009 @@ -1,9 +1,22 @@ -2009-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> +2009-12-01 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUtils.cc: bug fix 559226: Allow '&' to be escaped. + + * src/YGPushButton.cc: bug fix 558900. Default button + state forgotten. + + * src/YGTable.cc: bug fix 548058: Default button + state forgotten. + + * src/YGPackageSelector.cc: partial bug fix for 548437: + honor a couple of the flags. + +2009-11-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: added support for search based on description, filelist and author. -2009-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> +2009-11-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * Reverted to development state. Modified: trunk/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGFrame.cc?rev=59866&r1=… ============================================================================== --- trunk/gtk/src/YGFrame.cc (original) +++ trunk/gtk/src/YGFrame.cc Tue Dec 1 03:56:40 2009 @@ -10,7 +10,7 @@ // Instead of traditional looking frames, we use Gnome convention for the // frame's look. That is: don't draw a frame, use bold header and pad the child. -#define CHILD_INDENTATION 20 +#define CHILD_INDENTATION 12 class YGBaseFrame : public YGWidget { 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 Tue Dec 1 03:56:40 2009 @@ -85,10 +85,9 @@ return NULL; } -#if 0 // YOptionalWidgetFactory -YPackageSelector* YGOptionalWidgetFactory::createPatternSelector (YWidget* parent, long modeFlags) +YWidget* YGOptionalWidgetFactory::createPatternSelector (YWidget* parent, long modeFlags) { YGPackageSelectorPluginStub *plugin = YGPackageSelectorPluginStub::get(); if (plugin) @@ -96,12 +95,11 @@ return NULL; } -YPackageSelector* YGOptionalWidgetFactory::createSimplePatchSelector (YWidget* parent, long modeFlags) +YWidget* YGOptionalWidgetFactory::createSimplePatchSelector (YWidget* parent, long modeFlags) { YGPackageSelectorPluginStub *plugin = YGPackageSelectorPluginStub::get(); if (plugin) return plugin->createSimplePatchSelector (parent, modeFlags); return NULL; } -#endif Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=5986… ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Tue Dec 1 03:56:40 2009 @@ -121,19 +121,21 @@ { struct inner { static void realize_cb (GtkWidget *widget) - { gtk_widget_grab_focus (widget); } + { + GtkWidget *window = gtk_widget_get_toplevel (widget); + gtk_widget_grab_default (widget); + gtk_widget_grab_focus (widget); + } }; YPushButton::setDefaultButton (isDefault); if (isDefault) { GtkWidget *button = getWidget(); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (button); if (GTK_WIDGET_REALIZED (button)) - gtk_widget_grab_focus (button); - else - g_signal_connect (G_OBJECT (button), "realize", - G_CALLBACK (inner::realize_cb), this); + inner::realize_cb (button); + g_signal_connect (G_OBJECT (button), "realize", + G_CALLBACK (inner::realize_cb), this); } } @@ -146,6 +148,7 @@ } return true; } + #if 0 static gboolean treat_icon_cb (GtkWidget *widget, GdkEventExpose *event, YGPushButton *pThis) Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=59866&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Tue Dec 1 03:56:40 2009 @@ -236,6 +236,7 @@ #include "YTable.h" #include "YGDialog.h" #include <gdk/gdkkeysyms.h> +#include <string.h> class YGTable : public YTable, public YGTableView { @@ -321,6 +322,9 @@ int index = (n*2)+1; if (!sortable) index = -1; + gtk_tree_sortable_set_sort_func ( + GTK_TREE_SORTABLE (getModel()), index, tree_sort_cb, + GINT_TO_POINTER (index), NULL); gtk_tree_view_column_set_sort_column_id (column, index); } else @@ -418,6 +422,18 @@ return FALSE; } + static gint tree_sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer _index) + { + int index = GPOINTER_TO_INT (_index); + gchar *str_a, *str_b; + gtk_tree_model_get (model, a, index, &str_a, -1); + gtk_tree_model_get (model, b, index, &str_b, -1); + int ret = strcmp (str_a, str_b); + g_free (str_a); + g_free (str_b); + return ret; + } }; #if YAST2_VERSION >= 2017005 Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=59866&r1=5986… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Tue Dec 1 03:56:40 2009 @@ -179,10 +179,10 @@ virtual bool hasContextMenu() RET (true) - virtual bool hasSimplePatchSelector() RET (false) - virtual YWidget *createSimplePatchSelector (YWidget *parent, long modeFlags) RET (NULL) - virtual bool hasPatternSelector() RET (false) - virtual YWidget *createPatternSelector (YWidget *parent, long modeFlags) RET (NULL) + virtual bool hasSimplePatchSelector() RET (true) + virtual YWidget *createSimplePatchSelector (YWidget *parent, long modeFlags); + virtual bool hasPatternSelector() RET (true) + virtual YWidget *createPatternSelector (YWidget *parent, long modeFlags); }; #include <YApplication.h> Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=59866&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Tue Dec 1 03:56:40 2009 @@ -287,17 +287,22 @@ return ret; } -string YGUtils::mapKBAccel (const string &src) +std::string YGUtils::mapKBAccel (const std::string &src) { - // we won't use use replace since we also want to escape _ to __ std::string::size_type length = src.length(), i; string str; str.reserve (length); for (i = 0; i < length; i++) { if (src[i] == '_') str += "__"; - else if (src[i] == '&') - str += '_'; + else if (src[i] == '&') { + if (i+1 < length && src[i+1] == '&') { + str += '&'; // escaping + i++; + } + else + str += '_'; + } else str += src[i]; } 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 Tue Dec 1 03:56:40 2009 @@ -7,6 +7,7 @@ #define YUILogComponent "gtk" #include "config.h" +#include <YPackageSelector.h> #include <string.h> #include "YGUI.h" #include "YGUtils.h" @@ -1902,7 +1903,10 @@ static void icon_press_cb (GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, SearchEntry *pThis) - { gtk_entry_set_text (entry, ""); } + { + gtk_entry_set_text (entry, ""); + gtk_widget_grab_focus (GTK_WIDGET (entry)); + } static void grab_focus_cb (GtkWidget *widget) { gtk_widget_grab_focus (widget); } @@ -2225,8 +2229,14 @@ public: GtkWidget *getWidget() { return m_widget; } - UI() : m_type (Ypp::Package::PACKAGE_TYPE) + UI (YPackageSelector *sel) { + if (sel->onlineUpdateMode()) + m_type = Ypp::Package::PATCH_TYPE; + else if (!sel->searchMode()) + m_type = Ypp::Package::PATTERN_TYPE; + else + m_type = Ypp::Package::PACKAGE_TYPE; YGtkPackageView *view = ygtk_package_view_new (TRUE); view->setListener (this); m_view = GTK_WIDGET (view); @@ -2238,10 +2248,17 @@ gtk_paned_pack2 (GTK_PANED (view_pane), m_details->getWidget(), FALSE, TRUE); GtkWidget *combo = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Package")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Pattern")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Language")); - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + if (sel->onlineUpdateMode()) { + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Patch")); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + } + else { + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Package")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Pattern")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Language")); + int i = sel->searchMode() ? 0 : 1; + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i); + } g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (type_changed_cb), this); @@ -2369,7 +2386,6 @@ } }; -#include <YPackageSelector.h> #include "pkg-selector-help.h" class YGPackageSelector : public YPackageSelector, public YGWidget, public Ypp::Interface @@ -2425,7 +2441,7 @@ /* m_notebook = new QueryNotebook (onlineUpdate, repoMgrEnabled()); gtk_box_pack_start (GTK_BOX (vbox), m_notebook->getWidget(), TRUE, TRUE, 0); */ - UI *ui = new UI(); + UI *ui = new UI (this); gtk_box_pack_start (GTK_BOX (vbox), ui->getWidget(), TRUE, TRUE, 0); gtk_widget_hide (empty); @@ -2528,5 +2544,22 @@ YPackageSelector * YGPackageSelectorPluginImpl::createPackageSelector (YWidget *parent, long modeFlags) -{ return new YGPackageSelector (parent, modeFlags); } +{ + modeFlags &= YPkg_SearchMode; + return new YGPackageSelector (parent, modeFlags); +} + +YWidget * +YGPackageSelectorPluginImpl::createPatternSelector (YWidget *parent, long modeFlags) +{ + modeFlags ^= YPkg_SearchMode; + return new YGPackageSelector (parent, modeFlags); +} + +YWidget * +YGPackageSelectorPluginImpl::createSimplePatchSelector (YWidget *parent, long modeFlags) +{ + modeFlags &= YPkg_OnlineUpdateMode; + return new YGPackageSelector (parent, modeFlags); +} Modified: trunk/gtk/src/pkg/YGPackageSelectorPluginImpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelectorPlu… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelectorPluginImpl.h (original) +++ trunk/gtk/src/pkg/YGPackageSelectorPluginImpl.h Tue Dec 1 03:56:40 2009 @@ -14,8 +14,8 @@ { public: virtual YPackageSelector *createPackageSelector (YWidget *parent, long modeFlags); - virtual YWidget *createPatternSelector (YWidget *parent, long modeFlags) { return 0; } - virtual YWidget *createSimplePatchSelector (YWidget *parent, long modeFlags) { return 0; } + virtual YWidget *createPatternSelector (YWidget *parent, long modeFlags); + virtual YWidget *createSimplePatchSelector (YWidget *parent, long modeFlags); }; #endif /*YGPACKAGE_SELECTOR_PLUGIN_IMPL_H*/ 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 Tue Dec 1 03:56:40 2009 @@ -680,6 +680,7 @@ gtk_tree_view_set_search_column (view, NAME_PROP); gtk_tree_view_set_fixed_height_mode (view, TRUE); gtk_tree_view_set_headers_visible (view, FALSE); + gtk_tree_view_set_enable_tree_lines (view, TRUE); GtkTreeSelection *selection = gtk_tree_view_get_selection (view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); @@ -957,6 +958,7 @@ gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_resizable (column, TRUE); +// gtk_tree_view_column_set_reorderable (column, TRUE); if (size >= 0) gtk_tree_view_column_set_fixed_width (column, size); else Modified: trunk/gtk/src/ygtklinklabel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.h?rev=5986… ============================================================================== --- trunk/gtk/src/ygtklinklabel.h (original) +++ trunk/gtk/src/ygtklinklabel.h Tue Dec 1 03:56:40 2009 @@ -3,7 +3,11 @@ ********************************************************************/ /* A label with embed links. Because we only need a link at the end, that's - only what we support. */ + only what we support. + + In the future, we may want to use GtkLabel's new link support instead of + this custom widget. +*/ #ifndef YGTK_LINK_LABEL_H #define YGTK_LINK_LABEL_H Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=59866&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Dec 1 03:56:40 2009 @@ -642,8 +642,10 @@ GTK_WIDGET_CLASS (ygtk_wizard_parent_class)->realize (widget); YGtkWizard *wizard = YGTK_WIZARD (widget); if (wizard->m_default_button) { - gtk_widget_grab_default (wizard->m_default_button); - gtk_widget_grab_focus (wizard->m_default_button); + GtkWidget *window = gtk_widget_get_toplevel (widget); + if (GTK_IS_WINDOW (window)) + if (!gtk_window_get_default_widget (GTK_WINDOW (window))) + gtk_widget_grab_default (wizard->m_default_button); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0