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=55245&r1=55244&r2=55245&view=diff
==============================================================================
--- 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=55245&r1=55244&r2=55245&view=diff
==============================================================================
--- 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=55245&r1=55244&r2=55245&view=diff
==============================================================================
--- 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 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?rev=55245&view=auto
==============================================================================
--- 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?rev=55245&view=auto
==============================================================================
--- 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?rev=55245&view=auto
==============================================================================
--- 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?rev=55245&view=auto
==============================================================================
--- 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@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
