summaryrefslogtreecommitdiff
authorandyq <andyq>2003-01-12 00:41:12 (UTC)
committer andyq <andyq>2003-01-12 00:41:12 (UTC)
commit24d26d4255c323b4b6cd47c0bcce8bcc126d35ee (patch) (unidiff)
treed748641d8a82c9443ae9c502832c52309e4f557c
parente3fa5685865712ca930d9124b974506766e7b11e (diff)
downloadopie-24d26d4255c323b4b6cd47c0bcce8bcc126d35ee.zip
opie-24d26d4255c323b4b6cd47c0bcce8bcc126d35ee.tar.gz
opie-24d26d4255c323b4b6cd47c0bcce8bcc126d35ee.tar.bz2
Changed Packages meu to Actions to allow icons to fit on same line
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index e489d2d..1a2ac37 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -51,97 +51,97 @@ MainWindow :: MainWindow()
51 51
52 // Build menu and tool bars 52 // Build menu and tool bars
53 setToolBarsMovable( FALSE ); 53 setToolBarsMovable( FALSE );
54 54
55 QPEToolBar *bar = new QPEToolBar( this ); 55 QPEToolBar *bar = new QPEToolBar( this );
56 bar->setHorizontalStretchable( TRUE ); 56 bar->setHorizontalStretchable( TRUE );
57 QPEMenuBar *mb = new QPEMenuBar( bar ); 57 QPEMenuBar *mb = new QPEMenuBar( bar );
58 mb->setMargin( 0 ); 58 mb->setMargin( 0 );
59 bar = new QPEToolBar( this ); 59 bar = new QPEToolBar( this );
60 60
61 // Find toolbar 61 // Find toolbar
62 findBar = new QPEToolBar( this ); 62 findBar = new QPEToolBar( this );
63 addToolBar( findBar, QMainWindow::Top, true ); 63 addToolBar( findBar, QMainWindow::Top, true );
64 findBar->setHorizontalStretchable( true ); 64 findBar->setHorizontalStretchable( true );
65 findEdit = new QLineEdit( findBar ); 65 findEdit = new QLineEdit( findBar );
66 QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) ); 66 QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
67 findBar->setStretchableWidget( findEdit ); 67 findBar->setStretchableWidget( findEdit );
68 connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) ); 68 connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) );
69 69
70 // Packages menu 70 // Packages menu
71 QPopupMenu *popup = new QPopupMenu( this ); 71 QPopupMenu *popup = new QPopupMenu( this );
72 72
73 QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 ); 73 QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
74 a->setWhatsThis( tr( "Click here to update package lists from servers." ) ); 74 a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
75 connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( updateServer() ) ); 75 connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( updateServer() ) );
76 a->addTo( popup ); 76 a->addTo( popup );
77 a->addTo( bar ); 77 a->addTo( bar );
78 78
79 actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "aqpkg/upgrade" ), QString::null, 0, this, 0 ); 79 actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "aqpkg/upgrade" ), QString::null, 0, this, 0 );
80 actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) ); 80 actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) );
81 connect( actionUpgrade, SIGNAL( activated() ), networkPkgWindow, SLOT( upgradePackages() ) ); 81 connect( actionUpgrade, SIGNAL( activated() ), networkPkgWindow, SLOT( upgradePackages() ) );
82 actionUpgrade->addTo( popup ); 82 actionUpgrade->addTo( popup );
83 actionUpgrade->addTo( bar ); 83 actionUpgrade->addTo( bar );
84 84
85 iconDownload = Resource::loadPixmap( "aqpkg/download" ); 85 iconDownload = Resource::loadPixmap( "aqpkg/download" );
86 iconRemove = Resource::loadPixmap( "aqpkg/remove" ); 86 iconRemove = Resource::loadPixmap( "aqpkg/remove" );
87 actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); 87 actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
88 actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) ); 88 actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) );
89 connect( actionDownload, SIGNAL( activated() ), networkPkgWindow, SLOT( downloadPackage() ) ); 89 connect( actionDownload, SIGNAL( activated() ), networkPkgWindow, SLOT( downloadPackage() ) );
90 actionDownload->addTo( popup ); 90 actionDownload->addTo( popup );
91 actionDownload->addTo( bar ); 91 actionDownload->addTo( bar );
92 92
93 a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 ); 93 a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 );
94 a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) ); 94 a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) );
95 connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( applyChanges() ) ); 95 connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( applyChanges() ) );
96 a->addTo( popup ); 96 a->addTo( popup );
97 a->addTo( bar ); 97 a->addTo( bar );
98 98
99 mb->insertItem( tr( "Packages" ), popup ); 99 mb->insertItem( tr( "Actions" ), popup );
100 100
101 // View menu 101 // View menu
102 popup = new QPopupMenu( this ); 102 popup = new QPopupMenu( this );
103 103
104 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 );
105 actionUninstalled->setToggleAction( TRUE ); 105 actionUninstalled->setToggleAction( TRUE );
106 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." ) );
107 connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) ); 107 connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
108 actionUninstalled->addTo( popup ); 108 actionUninstalled->addTo( popup );
109 109
110 actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); 110 actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
111 actionInstalled->setToggleAction( TRUE ); 111 actionInstalled->setToggleAction( TRUE );
112 actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) ); 112 actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) );
113 connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) ); 113 connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) );
114 actionInstalled->addTo( popup ); 114 actionInstalled->addTo( popup );
115 115
116 actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); 116 actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
117 actionUpdated->setToggleAction( TRUE ); 117 actionUpdated->setToggleAction( TRUE );
118 actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) ); 118 actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
119 connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) ); 119 connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
120 actionUpdated->addTo( popup ); 120 actionUpdated->addTo( popup );
121 121
122 popup->insertSeparator(); 122 popup->insertSeparator();
123 123
124 actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 ); 124 actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 );
125 actionFilter->setToggleAction( TRUE ); 125 actionFilter->setToggleAction( TRUE );
126 actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) ); 126 actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
127 connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) ); 127 connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
128 actionFilter->addTo( popup ); 128 actionFilter->addTo( popup );
129 129
130 a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 ); 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." ) ); 131 a->setWhatsThis( tr( "Click here to change package category to used filter." ) );
132 connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) ); 132 connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) );
133 a->addTo( popup ); 133 a->addTo( popup );
134 134
135 popup->insertSeparator(); 135 popup->insertSeparator();
136 136
137 a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); 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." ) ); 138 a->setWhatsThis( tr( "Click here to search for text in package names." ) );
139 connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) ); 139 connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
140 a->addTo( popup ); 140 a->addTo( popup );
141 141
142 actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); 142 actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
143 actionFindNext->setEnabled( FALSE ); 143 actionFindNext->setEnabled( FALSE );
144 actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) ); 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() ) ); 145 connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
146 actionFindNext->addTo( popup ); 146 actionFindNext->addTo( popup );
147 actionFindNext->addTo( findBar ); 147 actionFindNext->addTo( findBar );