author | drw <drw> | 2003-01-10 21:36:13 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-10 21:36:13 (UTC) |
commit | 5199ee62d5478bbf5a8eb898c148352704f288e7 (patch) (unidiff) | |
tree | 15d48407fee127e10569a410659c954533f932c4 /noncore/settings | |
parent | 3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac (diff) | |
download | opie-5199ee62d5478bbf5a8eb898c148352704f288e7.zip opie-5199ee62d5478bbf5a8eb898c148352704f288e7.tar.gz opie-5199ee62d5478bbf5a8eb898c148352704f288e7.tar.bz2 |
Changed menu layout
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index e184f6b..e489d2d 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -98,42 +98,9 @@ MainWindow :: MainWindow() | |||
98 | 98 | ||
99 | mb->insertItem( tr( "Packages" ), popup ); | 99 | mb->insertItem( tr( "Packages" ), popup ); |
100 | 100 | ||
101 | // Search menu | ||
102 | popup = new QPopupMenu( this ); | ||
103 | |||
104 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | ||
105 | a->setWhatsThis( tr( "Click here to search for text in package names." ) ); | ||
106 | connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) ); | ||
107 | a->addTo( popup ); | ||
108 | |||
109 | actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); | ||
110 | actionFindNext->setEnabled( FALSE ); | ||
111 | actionFindNext->setWhatsThis( tr( "Click here to search for the package name containing the text you are searching for." ) ); | ||
112 | connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) ); | ||
113 | actionFindNext->addTo( popup ); | ||
114 | actionFindNext->addTo( findBar ); | ||
115 | |||
116 | // Show 'quick jump' keypad? | ||
117 | |||
118 | popup->insertSeparator(); | ||
119 | |||
120 | actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 ); | ||
121 | actionFilter->setToggleAction( TRUE ); | ||
122 | actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) ); | ||
123 | connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) ); | ||
124 | actionFilter->addTo( popup ); | ||
125 | |||
126 | a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 ); | ||
127 | a->setWhatsThis( tr( "Click here to change package category to used filter." ) ); | ||
128 | connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) ); | ||
129 | a->addTo( popup ); | ||
130 | |||
131 | mb->insertItem( tr( "Search" ), popup ); | ||
132 | |||
133 | |||
134 | // View menu | 101 | // View menu |
135 | popup = new QPopupMenu( this ); | 102 | popup = new QPopupMenu( this ); |
136 | 103 | ||
137 | actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); | 104 | actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); |
138 | actionUninstalled->setToggleAction( TRUE ); | 105 | actionUninstalled->setToggleAction( TRUE ); |
139 | actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) ); | 106 | actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) ); |
@@ -154,6 +121,37 @@ MainWindow :: MainWindow() | |||
154 | 121 | ||
155 | popup->insertSeparator(); | 122 | popup->insertSeparator(); |
156 | 123 | ||
124 | actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 ); | ||
125 | actionFilter->setToggleAction( TRUE ); | ||
126 | actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) ); | ||
127 | connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) ); | ||
128 | actionFilter->addTo( popup ); | ||
129 | |||
130 | a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 ); | ||
131 | a->setWhatsThis( tr( "Click here to change package category to used filter." ) ); | ||
132 | connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) ); | ||
133 | a->addTo( popup ); | ||
134 | |||
135 | popup->insertSeparator(); | ||
136 | |||
137 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | ||
138 | a->setWhatsThis( tr( "Click here to search for text in package names." ) ); | ||
139 | connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) ); | ||
140 | a->addTo( popup ); | ||
141 | |||
142 | actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); | ||
143 | actionFindNext->setEnabled( FALSE ); | ||
144 | actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) ); | ||
145 | connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) ); | ||
146 | actionFindNext->addTo( popup ); | ||
147 | actionFindNext->addTo( findBar ); | ||
148 | |||
149 | mb->insertItem( tr( "View" ), popup ); | ||
150 | |||
151 | |||
152 | // Options menu | ||
153 | popup = new QPopupMenu( this ); | ||
154 | |||
157 | a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 ); | 155 | a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 ); |
158 | a->setWhatsThis( tr( "Click here to configure this application." ) ); | 156 | a->setWhatsThis( tr( "Click here to configure this application." ) ); |
159 | connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) ); | 157 | connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) ); |
@@ -171,7 +169,7 @@ MainWindow :: MainWindow() | |||
171 | connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) ); | 169 | connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) ); |
172 | a->addTo( popup ); | 170 | a->addTo( popup ); |
173 | 171 | ||
174 | mb->insertItem( tr( "View" ), popup ); | 172 | mb->insertItem( tr( "Options" ), popup ); |
175 | 173 | ||
176 | // Finish find toolbar creation | 174 | // Finish find toolbar creation |
177 | a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 175 | a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |