February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55245 - in /trunk/qt-pkg/src: YQIconPool.cc YQIconPool.h YQPkgFilterTab.cc icons/arrow_down.xpm icons/arrow_left.xpm icons/arrow_right.xpm icons/arrow_up.xpm
by sh-sh-sh＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: sh-sh-sh Date: Wed Feb 4 15:01:35 2009 New Revision: 55245 URL: http://svn.opensuse.org/viewcvs/yast?rev=55245&view=rev Log: added icons + fixed off-by-one error Added: trunk/qt-pkg/src/icons/arrow_down.xpm trunk/qt-pkg/src/icons/arrow_left.xpm trunk/qt-pkg/src/icons/arrow_right.xpm trunk/qt-pkg/src/icons/arrow_up.xpm Modified: trunk/qt-pkg/src/YQIconPool.cc trunk/qt-pkg/src/YQIconPool.h trunk/qt-pkg/src/YQPkgFilterTab.cc Modified: trunk/qt-pkg/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.cc?rev=552… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.cc (original) +++ trunk/qt-pkg/src/YQIconPool.cc Wed Feb 4 15:01:35 2009 @@ -61,6 +61,10 @@ #include "icons/step_done.xpm" #include "icons/tab_remove.xpm" +#include "icons/arrow_left.xpm" +#include "icons/arrow_right.xpm" +#include "icons/arrow_up.xpm" +#include "icons/arrow_down.xpm" @@ -109,6 +113,10 @@ QPixmap YQIconPool::stepDone() { return iconPool()->cachedIcon( step_done_xpm ); } QPixmap YQIconPool::tabRemove() { return iconPool()->cachedIcon( tab_remove_xpm ); } +QPixmap YQIconPool::arrowLeft() { return iconPool()->cachedIcon( arrow_left_xpm ); } +QPixmap YQIconPool::arrowRight() { return iconPool()->cachedIcon( arrow_right_xpm ); } +QPixmap YQIconPool::arrowUp() { return iconPool()->cachedIcon( arrow_up_xpm ); } +QPixmap YQIconPool::arrowDown() { return iconPool()->cachedIcon( arrow_down_xpm ); } YQIconPool * YQIconPool::iconPool() Modified: trunk/qt-pkg/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.h?rev=5524… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.h (original) +++ trunk/qt-pkg/src/YQIconPool.h Wed Feb 4 15:01:35 2009 @@ -70,6 +70,10 @@ static QPixmap stepDone(); static QPixmap tabRemove(); + static QPixmap arrowLeft(); + static QPixmap arrowRight(); + static QPixmap arrowUp(); + static QPixmap arrowDown(); protected: Modified: trunk/qt-pkg/src/YQPkgFilterTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFilterTab.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgFilterTab.cc (original) +++ trunk/qt-pkg/src/YQPkgFilterTab.cc Wed Feb 4 15:01:35 2009 @@ -34,7 +34,9 @@ #define YUILogComponent "qt-pkg" #include "YUILog.h" +#include "YUI.h" #include "YUIException.h" +#include "YApplication.h" #include "YQPkgFilterTab.h" #include "YQPkgDiskUsageList.h" #include "YQSignalBlocker.h" @@ -42,6 +44,7 @@ #include "YQi18n.h" #include "utf8.h" + using std::vector; typedef vector<YQPkgFilterPage *> YQPkgFilterPageVector; @@ -367,6 +370,7 @@ priv->filtersWidgetStack->setCurrentWidget( page->content ); tabBar()->setCurrentIndex( page->tabIndex ); priv->closeButton->setEnabled( tabBar()->count() > 1 && page->closeEnabled ); + priv->tabContextMenuPage = page; emit currentChanged( page->content ); } @@ -495,21 +499,27 @@ priv->tabContextMenu = new QMenu( this ); YUI_CHECK_NEW( priv->tabContextMenu ); - priv->actionMovePageLeft = new QAction( _( "Move page &left" ), this ); + // Translators: Change this to "right" for Arabic and Hebrew + priv->actionMovePageLeft = new QAction( YUI::yApp()->reverseLayout() ? + YQIconPool::arrowRight() : YQIconPool::arrowLeft(), + _( "Move page &left" ), this ); YUI_CHECK_NEW( priv->actionMovePageLeft ); connect( priv->actionMovePageLeft, SIGNAL( triggered() ), this, SLOT ( contextMovePageLeft() ) ); - priv->actionMovePageRight = new QAction( _( "Move page &right" ), this ); + // Translators: Change this to "left" for Arabic and Hebrew + priv->actionMovePageRight = new QAction( YUI::yApp()->reverseLayout() ? + YQIconPool::arrowLeft() : YQIconPool::arrowRight(), + _( "Move page &right" ), this ); YUI_CHECK_NEW( priv->actionMovePageRight ); connect( priv->actionMovePageRight, SIGNAL( triggered() ), this, SLOT ( contextMovePageRight() ) ); - priv->actionClosePage = new QAction( _( "&Close page" ), this ); + priv->actionClosePage = new QAction( YQIconPool::tabRemove(), _( "&Close page" ), this ); YUI_CHECK_NEW( priv->actionClosePage ); connect( priv->actionClosePage, SIGNAL( triggered() ), @@ -525,9 +535,9 @@ priv->actionMovePageLeft->setEnabled( tabIndex > 0 ); priv->actionMovePageRight->setEnabled( tabIndex < ( tabBar()->count() - 1 ) ); - priv->actionClosePage->setEnabled( tabBar()->count() > 0 && priv->tabContextMenuPage->closeEnabled ); + priv->actionClosePage->setEnabled( tabBar()->count() > 1 && priv->tabContextMenuPage->closeEnabled ); - priv->tabContextMenu->popup( mapToGlobal( pos ) ); + priv->tabContextMenu->popup( tabBar()->mapToGlobal( pos ) ); return true; // event consumed - no further processing } Added: trunk/qt-pkg/src/icons/arrow_down.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/icons/arrow_down.xpm?… ============================================================================== --- trunk/qt-pkg/src/icons/arrow_down.xpm (added) +++ trunk/qt-pkg/src/icons/arrow_down.xpm Wed Feb 4 15:01:35 2009 @@ -0,0 +1,83 @@ +/* XPM */ +static const char * arrow_down_xpm[] = { +"15 16 64 1", +" c None", +". c #959695", +"+ c #8F8F8F", +"@ c #898989", +"# c #838382", +"$ c #7D7D7D", +"% c #767677", +"& c #707070", +"* c #6A6A6A", +"= c #646364", +"- c #5E5E5E", +"; c #575758", +"> c #959595", +", c #8E8F8F", +"' c #828382", +") c #7C7C7C", +"! c #767676", +"~ c #646463", +"{ c #5D5D5E", +"] c #575857", +"^ c #515151", +"/ c #4B4B4B", +"( c #8E8F8E", +"_ c #888988", +": c #828282", +"< c #7B7C7C", +"[ c #767575", +"} c #6F706F", +"| c #696969", +"1 c #636363", +"2 c #5D5D5D", +"3 c #575757", +"4 c #4A4A4B", +"5 c #444444", +"6 c #828182", +"7 c #7C7C7B", +"8 c #757576", +"9 c #706F6F", +"0 c #626362", +"a c #5C5C5D", +"b c #565756", +"c c #505050", +"d c #4A4B4A", +"e c #757575", +"f c #6F6F6F", +"g c #696968", +"h c #626262", +"i c #5C5D5D", +"j c #565656", +"k c #49494A", +"l c #434344", +"m c #686868", +"n c #5C5C5C", +"o c #565655", +"p c #4F4F50", +"q c #4A494A", +"r c #434343", +"s c #5B5C5C", +"t c #555555", +"u c #4F4F4F", +"v c #494949", +"w c #4E4E4E", +"x c #484948", +"y c #424243", +" ", +" ", +" ", +" ", +" ", +" .+@#$%&*=-; ", +" >,@')!&*~{]^/ ", +" (_:<[}|123^45 ", +" 6789|0abcd5 ", +" efghijckl ", +" mhnopqr ", +" stuvr ", +" wxy ", +" ", +" ", +" "}; Added: trunk/qt-pkg/src/icons/arrow_left.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/icons/arrow_left.xpm?… ============================================================================== --- trunk/qt-pkg/src/icons/arrow_left.xpm (added) +++ trunk/qt-pkg/src/icons/arrow_left.xpm Wed Feb 4 15:01:35 2009 @@ -0,0 +1,83 @@ +/* XPM */ +static const char * arrow_left_xpm[] = { +"16 15 65 1", +" c None", +". c #8B8C8B", +"+ c #848484", +"@ c #7E7D7E", +"# c #777777", +"$ c #8C8D8C", +"% c #858685", +"& c #7E7E7E", +"* c #707070", +"= c #8C8C8C", +"- c #868685", +"; c #7F7E7F", +"> c #787777", +", c #6A6969", +"' c #8D8D8E", +") c #868686", +"! c #7F7F7F", +"~ c #787878", +"{ c #717171", +"] c #6A6A6A", +"^ c #636363", +"/ c #8E8E8E", +"( c #868687", +"_ c #807F7F", +": c #797979", +"< c #727272", +"[ c #6B6A6B", +"} c #646463", +"| c #5D5D5D", +"1 c #878787", +"2 c #808080", +"3 c #727273", +"4 c #6B6B6B", +"5 c #646464", +"6 c #5D5D5E", +"7 c #565656", +"8 c #818180", +"9 c #7A7979", +"0 c #6C6B6C", +"a c #5E5E5D", +"b c #575657", +"c c #505050", +"d c #747373", +"e c #6C6C6C", +"f c #656565", +"g c #5E5E5E", +"h c #575757", +"i c #494949", +"j c #666665", +"k c #5E5F5F", +"l c #575758", +"m c #515150", +"n c #494A49", +"o c #434243", +"p c #585858", +"q c #515151", +"r c #4A4A4A", +"s c #434343", +"t c #3C3C3C", +"u c #4A4B4B", +"v c #444344", +"w c #3C3D3D", +"x c #353635", +"y c #3D3D3D", +"z c #363636", +" ", +" .+ ", +" .+@# ", +" $%&#* ", +" =-;>*, ", +" ')!~{]^ ", +" /(_:<[}| ", +" 12:34567 ", +" 89<05abc ", +" defghci ", +" jklmno ", +" pqrst ", +" uvwx ", +" yz ", +" "}; Added: trunk/qt-pkg/src/icons/arrow_right.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/icons/arrow_right.xpm… ============================================================================== --- trunk/qt-pkg/src/icons/arrow_right.xpm (added) +++ trunk/qt-pkg/src/icons/arrow_right.xpm Wed Feb 4 15:01:35 2009 @@ -0,0 +1,79 @@ +/* XPM */ +static const char * arrow_right_xpm[] = { +"16 15 61 1", +" c None", +". c #969596", +"+ c #8F8F8F", +"@ c #969696", +"# c #898988", +"$ c #818182", +"% c #909090", +"& c #898989", +"* c #828282", +"= c #7C7C7C", +"- c #747575", +"; c #8A8A8A", +"> c #838283", +", c #7B7C7C", +"' c #757575", +") c #6E6E6E", +"! c #686767", +"~ c #838383", +"{ c #757576", +"] c #6F6F6F", +"^ c #616160", +"/ c #5A5A5A", +"( c #7C7D7D", +"_ c #686868", +": c #626161", +"< c #5B5B5B", +"[ c #545353", +"} c #4D4D4D", +"| c #767676", +"1 c #6F6F70", +"2 c #686968", +"3 c #616262", +"4 c #555554", +"5 c #464747", +"6 c #707070", +"7 c #696A69", +"8 c #636362", +"9 c #4E4E4D", +"0 c #484847", +"a c #414140", +"b c #6A6A6A", +"c c #5C5C5C", +"d c #555556", +"e c #4E4E4F", +"f c #484748", +"g c #414141", +"h c #646364", +"i c #5C5D5C", +"j c #555656", +"k c #4F4F4F", +"l c #484848", +"m c #5D5D5D", +"n c #575657", +"o c #50504F", +"p c #494948", +"q c #424242", +"r c #565657", +"s c #505050", +"t c #494949", +"u c #494A49", +"v c #434343", +" ", +" .+ ", +" @+#$ ", +" %&*=- ", +" ;>,')! ", +" ~={]!^/ ", +" ({]_:<[} ", +" |123<4}5 ", +" 678<490a ", +" b8cdefg ", +" hijklg ", +" mnopq ", +" rstq ", +" uv ", +" "}; Added: trunk/qt-pkg/src/icons/arrow_up.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/icons/arrow_up.xpm?re… ============================================================================== --- trunk/qt-pkg/src/icons/arrow_up.xpm (added) +++ trunk/qt-pkg/src/icons/arrow_up.xpm Wed Feb 4 15:01:35 2009 @@ -0,0 +1,90 @@ +/* XPM */ +static const char * arrow_up_xpm[] = { +"15 16 71 1", +" c None", +". c #89898A", +"+ c #838483", +"@ c #7D7E7D", +"# c #888989", +"$ c #828382", +"% c #7C7D7C", +"& c #777777", +"* c #717070", +"= c #888988", +"- c #828282", +"; c #7C7C7C", +"> c #767676", +", c #707070", +"' c #6A6A6A", +") c #636464", +"! c #888887", +"~ c #7B7C7B", +"{ c #767675", +"] c #6F6F70", +"^ c #696969", +"/ c #636363", +"( c #5D5D5D", +"_ c #575657", +": c #878786", +"< c #818180", +"[ c #7A7B7B", +"} c #757474", +"| c #6F6F6F", +"1 c #686868", +"2 c #626263", +"3 c #5D5C5C", +"4 c #575656", +"5 c #505050", +"6 c #4A4B4A", +"7 c #868787", +"8 c #818080", +"9 c #7A7A7A", +"0 c #747474", +"a c #6E6E6E", +"b c #616262", +"c c #5B5C5C", +"d c #565656", +"e c #50504F", +"f c #494949", +"g c #434443", +"h c #3D3D3D", +"i c #80807F", +"j c #797979", +"k c #737374", +"l c #6D6D6D", +"m c #676767", +"n c #616161", +"o c #5B5B5B", +"p c #555455", +"q c #4F4F4E", +"r c #484849", +"s c #434342", +"t c #3D3D3C", +"u c #373736", +"v c #737273", +"w c #6C6D6C", +"x c #676766", +"y c #616160", +"z c #5A5A5A", +"A c #555555", +"B c #4E4E4E", +"C c #484848", +"D c #424242", +"E c #3C3C3C", +"F c #363636", +" ", +" ", +" ", +" .+@ ", +" #$%&* ", +" =-;>,') ", +" !-~{]^/(_ ", +" :<[}|123456 ", +" 7890a1bcdefgh ", +" ijklmnopqrstu ", +" vwxyzABCDEF ", +" ", +" ", +" ", +" ", +" "}; -- 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] r55244 - /trunk/devtools/package/yast2-devtools.changes
by coolo＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: coolo Date: Wed Feb 4 14:56:46 2009 New Revision: 55244 URL: http://svn.opensuse.org/viewcvs/yast?rev=55244&view=rev Log: submit to autobuild Modified: trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed Feb 4 14:56:46 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 4 14:55:59 CET 2009 - coolo(a)suse.de + +- remove .cvsignore files + +------------------------------------------------------------------- Fri Jan 16 23:24:00 CET 2009 - aschnell(a)suse.de - added some new YCP keywords to emacs mode -- 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] r55243 - in /trunk/devtools: ./ devtools/ devtools/admin/ devtools/admin/aclocal/ devtools/admin/copyright/ devtools/admin/copyright/gpl/ devtools/admin/copyright/yast/ devtools/admin/po/ devtools/...
by coolo＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: coolo Date: Wed Feb 4 14:55:48 2009 New Revision: 55243 URL: http://svn.opensuse.org/viewcvs/yast?rev=55243&view=rev Log: remove ignores Removed: trunk/devtools/.cvsignore trunk/devtools/devtools/.cvsignore trunk/devtools/devtools/admin/.cvsignore trunk/devtools/devtools/admin/aclocal/.cvsignore trunk/devtools/devtools/admin/copyright/.cvsignore trunk/devtools/devtools/admin/copyright/gpl/.cvsignore trunk/devtools/devtools/admin/copyright/yast/.cvsignore trunk/devtools/devtools/admin/po/.cvsignore trunk/devtools/devtools/bin/.cvsignore trunk/devtools/devtools/doc/.cvsignore trunk/devtools/devtools/doc/skeletons/.cvsignore trunk/devtools/devtools/doc/skeletons/config/.cvsignore trunk/devtools/devtools/skeletons/.cvsignore trunk/devtools/devtools/skeletons/agent/.cvsignore trunk/devtools/devtools/skeletons/agent/conf/.cvsignore trunk/devtools/devtools/skeletons/agent/doc/.cvsignore trunk/devtools/devtools/skeletons/agent/doc/autodocs/.cvsignore trunk/devtools/devtools/skeletons/agent/package/.cvsignore trunk/devtools/devtools/skeletons/agent/src/.cvsignore trunk/devtools/devtools/skeletons/agent/testsuite/.cvsignore trunk/devtools/devtools/skeletons/config-python/.cvsignore trunk/devtools/devtools/skeletons/config-python/agents/.cvsignore trunk/devtools/devtools/skeletons/config-python/doc/.cvsignore trunk/devtools/devtools/skeletons/config-python/doc/autodocs/.cvsignore trunk/devtools/devtools/skeletons/config-python/package/.cvsignore trunk/devtools/devtools/skeletons/config-python/src/.cvsignore trunk/devtools/devtools/skeletons/config-python/testsuite/.cvsignore trunk/devtools/devtools/skeletons/config-python/testsuite/tests/.cvsignore trunk/devtools/devtools/skeletons/config/.cvsignore trunk/devtools/devtools/skeletons/config/agents/.cvsignore trunk/devtools/devtools/skeletons/config/doc/.cvsignore trunk/devtools/devtools/skeletons/config/doc/autodocs/.cvsignore trunk/devtools/devtools/skeletons/config/package/.cvsignore trunk/devtools/devtools/skeletons/config/src/.cvsignore trunk/devtools/devtools/skeletons/config/testsuite/.cvsignore trunk/devtools/devtools/skeletons/config/testsuite/tests/.cvsignore trunk/devtools/docbook/.cvsignore trunk/devtools/docbook/css/.cvsignore trunk/devtools/docbook/images/.cvsignore trunk/devtools/docbook/images/admon/.cvsignore trunk/devtools/docbook/images/navig/.cvsignore trunk/devtools/docbook/stylesheets/.cvsignore trunk/devtools/doxygen/.cvsignore trunk/devtools/misc/.cvsignore trunk/devtools/scrdoc/.cvsignore trunk/devtools/scrdoc/doc/.cvsignore trunk/devtools/scrdoc/src/.cvsignore trunk/devtools/yast2/.cvsignore trunk/devtools/yast2/check_ycp/.cvsignore trunk/devtools/yast2/check_ycp/doc/.cvsignore trunk/devtools/ycpdoc/.cvsignore trunk/devtools/ycpdoc/doc/.cvsignore trunk/devtools/ycpdoc/doc/example/.cvsignore trunk/devtools/ycpdoc/src/.cvsignore trunk/devtools/ycpdoc/testsuite/.cvsignore trunk/devtools/ydoc/.cvsignore trunk/devtools/ydoc/doc/.cvsignore trunk/devtools/ydoc/po-tools/.cvsignore trunk/devtools/ydoc/src/.cvsignore trunk/devtools/yxp/.cvsignore -- 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] r55242 - in /trunk/bootloader: package/yast2-bootloader.changes src/grub/helps.ycp src/modules/BootSupportCheck.ycp src/routines/misc.ycp src/routines/popups.ycp
by juhliarik＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: juhliarik Date: Wed Feb 4 14:49:43 2009 New Revision: 55242 URL: http://svn.opensuse.org/viewcvs/yast?rev=55242&view=rev Log: added several fixes Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/helps.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/src/routines/popups.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Feb 4 14:49:43 2009 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Feb 4 14:50:21 CET 2008 - juhliarik(a)suse.cz + +- added fix for problem with unnecessary popup mesage for writting + bootloader to floppy (bnc #333459) +- added fix meesage about writting bootloader to floppy includes + "Cancel" button (bnc #433348) +- changed text about using XFS there is used "may not" insted of + "will not" (bug #449823) +- updated help text +- 2.18.1 + +------------------------------------------------------------------- Wed Feb 4 12:15:21 CET 2008 - juhliarik(a)suse.cz - added fix for finding the smallest partition on pmac machine Modified: trunk/bootloader/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?re… ============================================================================== --- trunk/bootloader/src/grub/helps.ycp (original) +++ trunk/bootloader/src/grub/helps.ycp Wed Feb 4 14:49:43 2009 @@ -59,7 +59,7 @@ to start this section."), "boot_extended" : ("Boot from Extended Partition should be selected if your root partition is on -local partition and the /boot partition is missing"), +logical partition and the /boot partition is missing"), "boot_custom" : _("Custom Boot Partition lets you choose a partition to boot from."), Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Wed Feb 4 14:49:43 2009 @@ -204,7 +204,7 @@ // check if /boot directory is on supported filesystem if (p["used_fs"]:nil == `xfs) { - AddNewProblem (_("The /boot directory is on an XFS filesystem. System will not boot.")); + AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot.")); y2error ("The /boot directory is on an XFS filesystem"); result = false; break; Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Wed Feb 4 14:49:43 2009 @@ -1178,7 +1178,8 @@ global boolean InstallingToFloppy () { boolean ret = false; if (loader_device == nil) - ret = false; + return ret; // bug #333459 - boot loader editor: propose new configuration + // -- BLE tries to write something on the floppy disk // bnc #180784 don't install to bootloader to floppy if ppc if (getLoaderType (false) == "ppc") ret = false; Modified: trunk/bootloader/src/routines/popups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/popups.y… ============================================================================== --- trunk/bootloader/src/routines/popups.ycp (original) +++ trunk/bootloader/src/routines/popups.ycp Wed Feb 4 14:49:43 2009 @@ -341,7 +341,7 @@ } Misc::boot_msg = ""; // empty that Misc::boot_msg indicate the message has been displayed - Report::Message(msg); + Popup::TimedOKCancel(msg, 10); } /** -- 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] r55241 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgDescriptionView.cc src/YQPkgDescriptionView.h src/YQPkgFileListView.cc
by tgoettlicher＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: tgoettlicher Date: Wed Feb 4 14:27:52 2009 New Revision: 55241 URL: http://svn.opensuse.org/viewcvs/yast?rev=55241&view=rev Log: - Added application icons to description view - Limited file list to 500 entries - V 2.18.3 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDescriptionView.cc trunk/qt-pkg/src/YQPkgDescriptionView.h trunk/qt-pkg/src/YQPkgFileListView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=55241&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Feb 4 14:27:52 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") 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 Wed Feb 4 14:27:52 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 4 14:13:15 CET 2009 - tgoettlicher(a)suse.de + +- Added application icons to description view +- Limited file list to 500 entries +- V 2.18.3 + +------------------------------------------------------------------- Wed Feb 4 13:54:08 CET 2009 - sh(a)suse.de - Added tab context menu (move left, move right, close) Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.… ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Wed Feb 4 14:27:52 2009 @@ -21,13 +21,28 @@ #define YUILogComponent "qt-pkg" #include "YUILog.h" #include <QRegExp> +#include <QFile> +#include <QFileInfo> #include <QList> +#include <QSettings> #include "zypp/VendorSupportOptions.h" #include "YQPkgDescriptionView.h" #include "YQPkgDescriptionDialog.h" #include "YQi18n.h" #include "utf8.h" +#define DESKTOP_TRANSLATIONS "desktop_translations" +#define DESKTOPFILEDIR "\\/share\\/applications\\/.*\\.desktop$" // RegExp +#define ICONSIZE "32x32" +#define ICONPATH "/usr/share/icons/locolor/"ICONSIZE"/apps/" \ + << "/usr/share/icons/hicolor/"ICONSIZE"/apps/" \ + << "/usr/share/icons/oxygen/"ICONSIZE"/apps/" \ + << "/usr/share/icons/Tango/"ICONSIZE"/apps/" \ + << "/usr/share/icons/gnome/"ICONSIZE"/apps/" \ + << "/opt/kde3/share/icons/hicolor/"ICONSIZE"/apps/"; + + + using std::list; using std::string; using namespace zypp; @@ -36,6 +51,7 @@ : YQPkgGenericDetailsView( parent ) { //FIXME setMimeSourceFactory( 0 ); + initLang(); } @@ -95,6 +111,12 @@ html_text += ""; } + // show application names and icons from desktop files if available + ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); + if ( installed ) + { + html_text += applicationIconList( installed->filenames() ); + } html_text += htmlEnd(); setHtml( html_text ); @@ -170,4 +192,125 @@ } +QString +YQPkgDescriptionView::applicationIconList( const list<string> & fileList ) const +{ + QString html; + QMap<QString, QString> desktopEntries; + + QStringList desktopFiles = findDesktopFiles( fileList ); + + if ( desktopFiles.size() == 0 ) + return QString(); + + // headline for a list of application icons that belong to a selected package + html += _("This package contains: "); + html += "<table border='0'>"; + + for ( int i = 0; i < desktopFiles.size(); ++i ) + { + desktopEntries = readDesktopFile( desktopFiles[i] ); + + html += "<tr><td valign='middle' align='center'>"; + html += QString( "<img src=\"" ) + findDesktopIcon ( desktopEntries["Icon"] ) + QString( "\">" ); + html += "</td><td valign='middle' align='left'>"; + html += "" + desktopEntries["Name"] + ""; + html += "</td></tr>"; + } + + html += "</table>"; + + return "" + html + ""; +} + + +QString +YQPkgDescriptionView::findDesktopIcon ( const QString& iconName ) const +{ + QStringList path; + path << ICONPATH; + + for ( int i=0; i < path.size(); ++i ) + { + QString fullName = path[i] + iconName + ".png"; + QFile file(fullName); + if ( file.exists() ) + return fullName; + } + + return QString(); +} + + +QMap<QString, QString> +YQPkgDescriptionView::readDesktopFile( const QString & fileName ) const +{ + QMap<QString, QString> desktopEntries; + QString name, genericName; + + QSettings file( fileName, QSettings::IniFormat ); + file.beginGroup( "Desktop Entry" ); + desktopEntries["Icon"] = file.value( "Icon" ).toString(); + desktopEntries["Exec"] = file.value( "Exec" ).toString(); + + // translate Name + name = file.value( QString( "Name[%1]" ).arg( langWithCountry ) ).toString(); + + if ( name.isEmpty() ) + name= file.value( QString( "Name[%1]" ).arg( lang ) ).toString() ; + + if ( name.isEmpty() ) + { + QFileInfo fileInfo (fileName); + QString msgid = QString( "Name(%1)" ).arg( fileInfo.fileName() ); + msgid += ": "; + msgid += file.value( QString( "Name" )).toString(); + name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toAscii() ) ); + + if ( name == msgid ) + name = ""; + } + if ( name.isEmpty() ) + name= file.value( QString( "Name" ) ).toString() ; + desktopEntries["Name"] = name; + + file.endGroup(); + + return desktopEntries; +} + + +QStringList +YQPkgDescriptionView::findDesktopFiles( const list<string> & fileList ) const +{ + QStringList desktopFiles; + + for ( list<string>::const_iterator it = fileList.begin(); + it != fileList.end(); ++it ) + { + QString line = fromUTF8( *it ); + + if ( line.contains( QRegExp( DESKTOPFILEDIR ) ) ) + desktopFiles << line; + } + + return desktopFiles; +} + + +void YQPkgDescriptionView::initLang() +{ + const char *lang_cstr = getenv( "LANG" ); + + if ( lang_cstr ) + { + langWithCountry = lang_cstr; + langWithCountry.replace( QRegExp( "[@\\.].*$" ), "" ); // remove .utf8 / @euro etc. + + lang = langWithCountry; + lang.replace( QRegExp( "_.*$" ), "" ); // remove _DE etc. + } +} + + #include "YQPkgDescriptionView.moc" Modified: trunk/qt-pkg/src/YQPkgDescriptionView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.… ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.h (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.h Wed Feb 4 14:27:52 2009 @@ -23,6 +23,9 @@ #include <QUrl> #include "YQPkgGenericDetailsView.h" +using std::list; +using std::string; + /** * @short Display the description of a ZyppObj derived object along with its @@ -71,6 +74,36 @@ * e.g., a "pkg:somepkg" link to another package. **/ void showLink( const QUrl & url ); + + /** + * Return html text that contains a list of application icons. + **/ + QString applicationIconList( const list<string> & fileList ) const; + + /** + * Find absolute file name (incl. path) for a icon. + **/ + QString findDesktopIcon ( const QString& iconName ) const; + + /** + * Extract name, icon and exec attributes from a desktop file. + **/ + QMap<QString, QString> readDesktopFile( const QString & fileName ) const; + + /** + * Search for all desktop files in a file list. + **/ + QStringList findDesktopFiles( const list<string> & fileList ) const; + + /** + * Initialize the language code (lang). + **/ + void initLang(); + +private: + QString langWithCountry; + QString lang; + }; Modified: trunk/qt-pkg/src/YQPkgFileListView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFileListView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgFileListView.cc (original) +++ trunk/qt-pkg/src/YQPkgFileListView.cc Wed Feb 4 14:27:52 2009 @@ -28,7 +28,7 @@ #include "utf8.h" -#define MAX_LINES 5000 +#define MAX_LINES 500 YQPkgFileListView::YQPkgFileListView( QWidget * parent ) @@ -98,9 +98,11 @@ html += "... "; html += "... "; } - - // %1 is the total number of files in a file list - html += " " + _( "%1 files total" ).arg( (unsigned long) fileList.size() ); + else + { + // %1 is the total number of files in a file list + html += " " + _( "%1 files total" ).arg( (unsigned long) fileList.size() ); + } return "" + html + ""; } -- 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] r55240 - in /trunk/core/agent-dbus/src: DbusAgent.cc DbusAgent.h
by aschnell＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: aschnell Date: Wed Feb 4 14:13:05 2009 New Revision: 55240 URL: http://svn.opensuse.org/viewcvs/yast?rev=55240&view=rev Log: - fixed resource leaks (thanks to Ladislav) Modified: trunk/core/agent-dbus/src/DbusAgent.cc trunk/core/agent-dbus/src/DbusAgent.h Modified: trunk/core/agent-dbus/src/DbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.cc… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.cc (original) +++ trunk/core/agent-dbus/src/DbusAgent.cc Wed Feb 4 14:13:05 2009 @@ -21,6 +21,7 @@ DbusAgent::~DbusAgent() { + disconnect(); } @@ -136,16 +137,23 @@ { const char* param = tmp3->asString()->value_cstr(); if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &param)) + { + dbus_message_unref(message); return YCPError("dbus_message_iter_append_basic() failed"); + } } else if (tmp3->isBoolean()) { bool param = tmp3->asBoolean()->value(); if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &param)) + { + dbus_message_unref(message); return YCPError("dbus_message_iter_append_basic() failed"); + } } else { + dbus_message_unref(message); return YCPError("Unsupported type"); } } @@ -204,6 +212,8 @@ void DbusAgent::connect(DBusBusType type) { + disconnect(); + y2milestone("connecting dbus"); connection = dbus_bus_get(type, &error); @@ -218,3 +228,14 @@ y2error("connecting dbus failed"); } } + + +void +DbusAgent::disconnect() +{ + if (connection) + { + dbus_connection_unref(connection); + connection = NULL; + } +} Modified: trunk/core/agent-dbus/src/DbusAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.h?… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.h (original) +++ trunk/core/agent-dbus/src/DbusAgent.h Wed Feb 4 14:13:05 2009 @@ -60,6 +60,7 @@ private: void connect(DBusBusType type); + void disconnect(); DBusConnection* connection; DBusError error; -- 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] r55239 - in /branches/tmp/lslezak/core: dbus/namespace_service/DBusModulesServer.cc liby2dbus/src/DBusMsg.cc
by lslezak＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: lslezak Date: Wed Feb 4 14:00:13 2009 New Revision: 55239 URL: http://svn.opensuse.org/viewcvs/yast?rev=55239&view=rev Log: - fixed list and map fucntion signatures - fixed conversion YCPList -> DBus message Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Wed Feb 4 14:00:13 2009 @@ -182,8 +182,10 @@ case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break; - case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; - case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_VARIANT_AS_STRING; break; /* av */ + case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_VARIANT_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING; break; /* a{vv} */ case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Wed Feb 4 14:00:13 2009 @@ -280,23 +280,42 @@ int sz = lst->size(); int index = 0; + // use string as fallback for empty map + std::string list_type(sz ? typeStr(lst->value(0)) : DBUS_TYPE_STRING_AS_STRING); + + // dbus allows only basic complete types in a list + const std::string valid_list_types(DBUS_TYPE_INT64_AS_STRING DBUS_TYPE_DOUBLE_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_BOOLEAN_AS_STRING); + + if (valid_list_types.find(list_type) == std::string::npos) + { + y2error("Invalid type of list item (non-basic type): %s, ignoring the list", list_type.c_str()); + return false; + } + DBusMessageIter array_it; // open array container y2debug("Opening array container"); - dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "v", &array_it); + + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, list_type.c_str(), &array_it); while(index < sz) { y2debug("Adding YCP value at index %d", index); - // add VARIANT container - DBusMessageIter var_it; - dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(lst->value(index)), &var_it); - // add the raw YCP value - addValueAt(lst->value(index), &array_it); + YCPValue list_item = lst->value(index); - y2debug("Closing VARIANT container"); - dbus_message_iter_close_container(&array_it, &var_it); + if (typeStr(list_item) != list_type) + { + y2error("Found different type in list: %s (expected %s) - ignoring item %s", + typeStr(list_item), list_type.c_str(), + list_item->toString().c_str()); + } + else + { + // add the raw YCP value + addValueAt(lst->value(index), &array_it); + } index++; } @@ -313,7 +332,7 @@ YCPMapIterator mit = map.begin(); // use string as fallback for empty map - std::string key_type(mit == map.end() ? "s" : typeStr(mit.key())); + std::string key_type(mit == map.end() ? DBUS_TYPE_STRING_AS_STRING : typeStr(mit.key())); // dbus allows only basic types as key type in a map const std::string valid_key_types(DBUS_TYPE_INT64_AS_STRING DBUS_TYPE_DOUBLE_AS_STRING -- 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] r55238 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgFilterTab.cc src/YQPkgFilterTab.h
by sh-sh-sh＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: sh-sh-sh Date: Wed Feb 4 13:55:01 2009 New Revision: 55238 URL: http://svn.opensuse.org/viewcvs/yast?rev=55238&view=rev Log: Added tab context menu (move left, move right, close) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgFilterTab.cc trunk/qt-pkg/src/YQPkgFilterTab.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 Wed Feb 4 13:55:01 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 4 13:54:08 CET 2009 - sh(a)suse.de + +- Added tab context menu (move left, move right, close) + +------------------------------------------------------------------- Thu Jan 29 11:59:13 CET 2009 - sh(a)suse.de - Use tabs instead of combo box for switching filter views Modified: trunk/qt-pkg/src/YQPkgFilterTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFilterTab.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgFilterTab.cc (original) +++ trunk/qt-pkg/src/YQPkgFilterTab.cc Wed Feb 4 13:55:01 2009 @@ -20,6 +20,7 @@ #include <vector> +#include <algorithm> // std::swap() #include <QAction> #include <QHBoxLayout> @@ -64,6 +65,8 @@ , rightPane(0) , viewButton(0) , closeButton(0) + , tabContextMenu(0) + , tabContextMenuPage(0) {} QStackedWidget * baseClassWidgetStack; @@ -74,6 +77,11 @@ QWidget * rightPane; QPushButton * viewButton; QToolButton * closeButton; + QMenu * tabContextMenu; + QAction * actionMovePageLeft; + QAction * actionMovePageRight; + QAction * actionClosePage; + YQPkgFilterPage * tabContextMenuPage; YQPkgFilterPageVector pages; }; @@ -141,7 +149,8 @@ priv->viewButton = new QPushButton( _( "&View" ), buttonBox ); YUI_CHECK_NEW( priv->viewButton ); buttonBoxLayout->addWidget( priv->viewButton ); -#endif + +#endif // VIEW_BUTTON_LEFT QMenu * menu = new QMenu(); YUI_CHECK_NEW( menu ); @@ -160,7 +169,8 @@ connect( priv->closeButton, SIGNAL( clicked() ), this, SLOT ( closeCurrentPage() ) ); -#endif + +#endif // SHOW_ONLY_IMPORTANT_PAGES // @@ -218,6 +228,9 @@ connect( tabBar(), SIGNAL( currentChanged( int ) ), this, SLOT ( showPage ( int ) ) ); + tabBar()->installEventFilter( this ); // for tab context menu + + // // Cosmetics // @@ -293,6 +306,7 @@ #endif { page->tabIndex = tabBar()->addTab( pageLabel ); + priv->closeButton->setEnabled( tabBar()->count() > 1 && page->closeEnabled ); } } @@ -352,6 +366,7 @@ priv->filtersWidgetStack->setCurrentWidget( page->content ); tabBar()->setCurrentIndex( page->tabIndex ); + priv->closeButton->setEnabled( tabBar()->count() > 1 && page->closeEnabled ); emit currentChanged( page->content ); } @@ -437,6 +452,185 @@ } +int +YQPkgFilterTab::tabCount() const +{ + return tabBar()->count(); +} + + +bool +YQPkgFilterTab::eventFilter ( QObject * watchedObj, QEvent * event ) +{ + if ( watchedObj == tabBar() && + event && event->type() == QEvent::MouseButtonPress ) + { + QMouseEvent * mouseEvent = dynamic_cast<QMouseEvent *> (event); + + if ( mouseEvent && mouseEvent->button() == Qt::RightButton ) + { + return postTabContextMenu( mouseEvent->pos() ); + } + } + + return QTabWidget::eventFilter( watchedObj, event ); +} + + +bool +YQPkgFilterTab::postTabContextMenu( const QPoint & pos ) +{ + int tabIndex = tabBar()->tabAt( pos ); + + if ( tabIndex >= 0 ) // -1 means "no tab at that position" + { + priv->tabContextMenuPage = findPage( tabIndex ); + + if ( priv->tabContextMenuPage ) + { + if ( ! priv->tabContextMenu ) + { + // On-demand menu creation + + priv->tabContextMenu = new QMenu( this ); + YUI_CHECK_NEW( priv->tabContextMenu ); + + priv->actionMovePageLeft = new QAction( _( "Move page &left" ), this ); + YUI_CHECK_NEW( priv->actionMovePageLeft ); + + connect( priv->actionMovePageLeft, SIGNAL( triggered() ), + this, SLOT ( contextMovePageLeft() ) ); + + + priv->actionMovePageRight = new QAction( _( "Move page &right" ), this ); + YUI_CHECK_NEW( priv->actionMovePageRight ); + + connect( priv->actionMovePageRight, SIGNAL( triggered() ), + this, SLOT ( contextMovePageRight() ) ); + + + priv->actionClosePage = new QAction( _( "&Close page" ), this ); + YUI_CHECK_NEW( priv->actionClosePage ); + + connect( priv->actionClosePage, SIGNAL( triggered() ), + this, SLOT ( contextClosePage() ) ); + + + priv->tabContextMenu->addAction( priv->actionMovePageLeft ); + priv->tabContextMenu->addAction( priv->actionMovePageRight ); + priv->tabContextMenu->addAction( priv->actionClosePage ); + } + + // Enable / disable actions + + priv->actionMovePageLeft->setEnabled( tabIndex > 0 ); + priv->actionMovePageRight->setEnabled( tabIndex < ( tabBar()->count() - 1 ) ); + priv->actionClosePage->setEnabled( tabBar()->count() > 0 && priv->tabContextMenuPage->closeEnabled ); + + priv->tabContextMenu->popup( mapToGlobal( pos ) ); + + return true; // event consumed - no further processing + } + } + + return false; // no tab at that position +} + + +void +YQPkgFilterTab::contextMovePageLeft() +{ + if ( priv->tabContextMenuPage ) + { + int contextPageIndex = priv->tabContextMenuPage->tabIndex; + int otherPageIndex = contextPageIndex-1; + + if ( otherPageIndex >= 0 ) + { + swapTabs( priv->tabContextMenuPage, findPage( otherPageIndex ) ); + } + } +} + + +void +YQPkgFilterTab::contextMovePageRight() +{ + if ( priv->tabContextMenuPage ) + { + int contextPageIndex = priv->tabContextMenuPage->tabIndex; + int otherPageIndex = contextPageIndex+1; + + if ( otherPageIndex < tabBar()->count() ) + { + swapTabs( priv->tabContextMenuPage, findPage( otherPageIndex ) ); + } + } +} + + +void +YQPkgFilterTab::swapTabs( YQPkgFilterPage * page1, YQPkgFilterPage * page2 ) +{ + if ( ! page1 or ! page2 ) + return; + + int oldCurrentIndex = tabBar()->currentIndex(); + std::swap( page1->tabIndex, page2->tabIndex ); + tabBar()->setTabText( page1->tabIndex, page1->label ); + tabBar()->setTabText( page2->tabIndex, page2->label ); + + yuiDebug() << "Swapping tabs \"" << toUTF8( page1->label ) + << "\" and \"" << toUTF8( page2->label ) << "\"" + << endl; + + + // If one of the two pages was the currently displayed one, + // make sure the same one is still displayed + + if ( oldCurrentIndex == page1->tabIndex ) + { + YQSignalBlocker sigBlocker( tabBar() ); + tabBar()->setCurrentIndex( page2->tabIndex ); + } + else if ( oldCurrentIndex == page2->tabIndex ) + { + YQSignalBlocker sigBlocker( tabBar() ); + tabBar()->setCurrentIndex( page1->tabIndex ); + } +} + + +void +YQPkgFilterTab::contextClosePage() +{ + if ( priv->tabContextMenuPage ) + { + int pageIndex = priv->tabContextMenuPage->tabIndex; + int oldCurrentIndex = tabBar()->currentIndex(); + tabBar()->removeTab( pageIndex ); + + + // + // Adjust tab index of the active pages to the right of that page + // + + for ( YQPkgFilterPageVector::iterator it = priv->pages.begin(); + it != priv->pages.end(); + ++it ) + { + YQPkgFilterPage * page = *it; + + if ( page->tabIndex >= pageIndex ) + page->tabIndex--; + } + + if ( oldCurrentIndex == pageIndex ) // this page was the current page + showPage( tabBar()->currentIndex() ); // display the new current page + } +} + + #include "YQPkgFilterTab.moc" Modified: trunk/qt-pkg/src/YQPkgFilterTab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFilterTab.h?rev=… ============================================================================== --- trunk/qt-pkg/src/YQPkgFilterTab.h (original) +++ trunk/qt-pkg/src/YQPkgFilterTab.h Wed Feb 4 13:55:01 2009 @@ -101,6 +101,39 @@ **/ YQPkgDiskUsageList * diskUsageList() const; + /** + * Find a filter page by its content widget (the widget that was passed + * to addPage() ). + * Return 0 if there is no such page. + **/ + YQPkgFilterPage * findPage( QWidget * pageContent ); + + /** + * Find a filter page by its internal name. + * Return 0 if there is no such page. + **/ + YQPkgFilterPage * findPage( const QString & internalName ); + + /** + * Find a filter page by its tab index. + * Return 0 if there is no such page. + **/ + YQPkgFilterPage * findPage( int tabIndex ); + + /** + * Return the number of open tabs. + **/ + int tabCount() const; + + /** + * Event filter to catch mouse right clicks on open tabs for the tab + * context menu. Returns 'true' if the event is processed and consumed, + * 'false' if processed should be continued by the watched object itself. + * + * Reimplemented from QObject. + **/ + virtual bool eventFilter ( QObject * watchedObj, QEvent * event ); + signals: @@ -123,7 +156,8 @@ * Close the current page unless this is the last visible page. **/ void closeCurrentPage(); - + + protected slots: /** @@ -136,7 +170,24 @@ **/ void showPage( QAction * action ); + /** + * Move the current tab page (from the context menu) one position to the + * left. + **/ + void contextMovePageLeft(); + + /** + * Move the current tab page (from the context menu) one position to the + * right. + **/ + void contextMovePageRight(); + + /** + * Close the current tab page (from the context menu). + **/ + void contextClosePage(); + protected: /** @@ -145,25 +196,18 @@ void showPage( YQPkgFilterPage * page ); /** - * Find a filter page by its content widget (the widget that was passed - * to addPage() ). - * Return 0 if there is no such page. - **/ - YQPkgFilterPage * findPage( QWidget * pageContent ); - - /** - * Find a filter page by its internal name. - * Return 0 if there is no such page. + * Open the tab context menu for the tab at the specified position. + * Return 'true' upon success (i.e., there is a tab at that position), + * 'false' upon failure. **/ - YQPkgFilterPage * findPage( const QString & internalName ); + bool postTabContextMenu( const QPoint & pos ); /** - * Find a filter page by its tab index. - * Return 0 if there is no such page. + * Swap two tabs and adjust their tab indices accordingly. **/ - YQPkgFilterPage * findPage( int tabIndex ); - - + void swapTabs( YQPkgFilterPage * page1, YQPkgFilterPage * page2 ); + + private: ImplPtr<YQPkgFilterTabPrivate> priv; @@ -184,6 +228,7 @@ , label( pageLabel ) , id( internalName ) , showAlways( showAlways ) + , closeEnabled( true ) , tabIndex( -1 ) {} @@ -191,6 +236,7 @@ QString label; // user visible text QString id; // internal name bool showAlways; + bool closeEnabled; int tabIndex; // index of the corresponding tab or -1 if none }; -- 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] r55237 - /tags/stable-2_17_6/nfs-server/
by mvidner＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: mvidner Date: Wed Feb 4 13:21:51 2009 New Revision: 55237 URL: http://svn.opensuse.org/viewcvs/yast?rev=55237&view=rev Log: Created tag stable-2_17_6 for nfs-server Added: tags/stable-2_17_6/nfs-server/ - copied from r55236, trunk/nfs-server/ -- 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] r55236 - /trunk/installation/control/control.openSUSE.xml
by jsrain＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: jsrain Date: Wed Feb 4 13:16:08 2009 New Revision: 55236 URL: http://svn.opensuse.org/viewcvs/yast?rev=55236&view=rev Log: added (so far commented) resizing of windows partition prior the proposal Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Wed Feb 4 13:16:08 2009 @@ -643,6 +643,14 @@ <label>Desktop Selection</label> <name>new_desktop</name> </module> + <module> <label>Disk</label> <name>disk_proposal</name> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0