summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro17
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp2
2 files changed, 18 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 98c358c..d8eee6a 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -33,15 +33,32 @@ SOURCES = mainwin.cpp \
33 version.cpp \ 33 version.cpp \
34 categoryfilterimpl.cpp 34 categoryfilterimpl.cpp
35 INTERFACES= settings.ui \ 35 INTERFACES= settings.ui \
36 install.ui \ 36 install.ui \
37 instoptions.ui \ 37 instoptions.ui \
38 categoryfilter.ui 38 categoryfilter.ui
39 TARGET = aqpkg 39 TARGET = aqpkg
40INCLUDEPATH += $(OPIEDIR)/include 40INCLUDEPATH += $(OPIEDIR)/include
41DEPENDPATH += $(OPIEDIR)/include 41DEPENDPATH += $(OPIEDIR)/include
42LIBS += -lqpe -lopie -lstdc++ 42LIBS += -lqpe -lopie -lstdc++
43DESTDIR = $(OPIEDIR)/bin 43DESTDIR = $(OPIEDIR)/bin
44 44
45TRANSLATIONS = ../../../i18n/de/aqpkg.ts \
46 ../../../i18n/xx/aqpkg.ts \
47 ../../../i18n/en/aqpkg.ts \
48 ../../../i18n/es/aqpkg.ts \
49 ../../../i18n/fr/aqpkg.ts \
50 ../../../i18n/hu/aqpkg.ts \
51 ../../../i18n/ja/aqpkg.ts \
52 ../../../i18n/ko/aqpkg.ts \
53 ../../../i18n/no/aqpkg.ts \
54 ../../../i18n/pl/aqpkg.ts \
55 ../../../i18n/pt/aqpkg.ts \
56 ../../../i18n/pt_BR/aqpkg.ts \
57 ../../../i18n/sl/aqpkg.ts \
58 ../../../i18n/zh_CN/aqpkg.ts \
59 ../../../i18n/zh_TW/aqpkg.ts \
60 ../../../i18n/it/aqpkg.ts \
61 ../../../i18n/da/aqpkg.ts
45 62
46 63
47include ( $(OPIEDIR)/include.pro ) 64include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index bf2c482..75ce1a1 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -148,25 +148,25 @@ void InstallDlgImpl :: installSelected()
148 if ( btnInstall->text() == "Abort" ) 148 if ( btnInstall->text() == "Abort" )
149 { 149 {
150 if ( pIpkg ) 150 if ( pIpkg )
151 { 151 {
152 displayText( "\n**** User Clicked ABORT ***" ); 152 displayText( "\n**** User Clicked ABORT ***" );
153 pIpkg->abort(); 153 pIpkg->abort();
154 displayText( "**** Process Aborted ****" ); 154 displayText( "**** Process Aborted ****" );
155 } 155 }
156 156
157 btnInstall->setText( tr( "Close" ) ); 157 btnInstall->setText( tr( "Close" ) );
158 return; 158 return;
159 } 159 }
160 else if ( btnInstall->text() == "Close" ) 160 else if ( btnInstall->text() == tr( "Close" ) )
161 { 161 {
162 done( 1 ); 162 done( 1 );
163 return; 163 return;
164 } 164 }
165 165
166 // Disable buttons 166 // Disable buttons
167 btnOptions->setEnabled( false ); 167 btnOptions->setEnabled( false );
168// btnInstall->setEnabled( false ); 168// btnInstall->setEnabled( false );
169 169
170 btnInstall->setText( "Abort" ); 170 btnInstall->setText( "Abort" );
171 171
172 if ( pIpkg ) 172 if ( pIpkg )