author | andyq <andyq> | 2002-10-10 11:53:44 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-10 11:53:44 (UTC) |
commit | 4ecb48197df25b84ce0d1e6ec95e78c2fa6d0699 (patch) (unidiff) | |
tree | e32369cb3acfb3e79f60d4c9f94adeaaaa3a4123 | |
parent | cb2b407e2f58a73447d706de7c374bf275a96992 (diff) | |
download | opie-4ecb48197df25b84ce0d1e6ec95e78c2fa6d0699.zip opie-4ecb48197df25b84ce0d1e6ec95e78c2fa6d0699.tar.gz opie-4ecb48197df25b84ce0d1e6ec95e78c2fa6d0699.tar.bz2 |
Made output text box text slightly smalled so more output can be displayed
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index 31be213..d4f751c 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -7,96 +7,100 @@ | |||
7 | ***************************************************************************/ | 7 | ***************************************************************************/ |
8 | 8 | ||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #ifdef QWS | 18 | #ifdef QWS |
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | #include <qmultilineedit.h> | 22 | #include <qmultilineedit.h> |
23 | #include <qdialog.h> | 23 | #include <qdialog.h> |
24 | #include <qcombobox.h> | 24 | #include <qcombobox.h> |
25 | #include <qcheckbox.h> | 25 | #include <qcheckbox.h> |
26 | #include <qpushbutton.h> | 26 | #include <qpushbutton.h> |
27 | 27 | ||
28 | 28 | ||
29 | #include "datamgr.h" | 29 | #include "datamgr.h" |
30 | #include "instoptionsimpl.h" | 30 | #include "instoptionsimpl.h" |
31 | #include "destination.h" | 31 | #include "destination.h" |
32 | #include "installdlgimpl.h" | 32 | #include "installdlgimpl.h" |
33 | #include "global.h" | 33 | #include "global.h" |
34 | 34 | ||
35 | InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) | 35 | InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) |
36 | : InstallDlg( parent, name, modal, fl ) | 36 | : InstallDlg( parent, name, modal, fl ) |
37 | { | 37 | { |
38 | dataMgr = dataManager; | 38 | dataMgr = dataManager; |
39 | vector<Destination>::iterator dit; | 39 | vector<Destination>::iterator dit; |
40 | 40 | ||
41 | QString defaultDest = "root"; | 41 | QString defaultDest = "root"; |
42 | #ifdef QWS | 42 | #ifdef QWS |
43 | Config cfg( "aqpkg" ); | 43 | Config cfg( "aqpkg" ); |
44 | cfg.setGroup( "settings" ); | 44 | cfg.setGroup( "settings" ); |
45 | defaultDest = cfg.readEntry( "dest", "root" ); | 45 | defaultDest = cfg.readEntry( "dest", "root" ); |
46 | 46 | ||
47 | // Grab flags - Turn MAKE_LINKS on by default (if no flags found) | 47 | // Grab flags - Turn MAKE_LINKS on by default (if no flags found) |
48 | flags = cfg.readNumEntry( "installFlags", MAKE_LINKS ); | 48 | flags = cfg.readNumEntry( "installFlags", MAKE_LINKS ); |
49 | #else | 49 | #else |
50 | flags = 0; | 50 | flags = 0; |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | // Output text is read only | 53 | // Output text is read only |
54 | output->setReadOnly( true ); | 54 | output->setReadOnly( true ); |
55 | QFont f( "helvetica" ); | ||
56 | f.setPointSize( 10 ); | ||
57 | output->setFont( f ); | ||
58 | |||
55 | 59 | ||
56 | // setup destination data | 60 | // setup destination data |
57 | int defIndex = 0; | 61 | int defIndex = 0; |
58 | int i; | 62 | int i; |
59 | for ( i = 0 , dit = dataMgr->getDestinationList().begin() ; dit != dataMgr->getDestinationList().end() ; ++dit, ++i ) | 63 | for ( i = 0 , dit = dataMgr->getDestinationList().begin() ; dit != dataMgr->getDestinationList().end() ; ++dit, ++i ) |
60 | { | 64 | { |
61 | destination->insertItem( dit->getDestinationName() ); | 65 | destination->insertItem( dit->getDestinationName() ); |
62 | if ( dit->getDestinationName() == defaultDest ) | 66 | if ( dit->getDestinationName() == defaultDest ) |
63 | defIndex = i; | 67 | defIndex = i; |
64 | } | 68 | } |
65 | 69 | ||
66 | destination->setCurrentItem( defIndex ); | 70 | destination->setCurrentItem( defIndex ); |
67 | 71 | ||
68 | vector<QString>::iterator it; | 72 | vector<QString>::iterator it; |
69 | // setup package data | 73 | // setup package data |
70 | QString remove = "Remove\n"; | 74 | QString remove = "Remove\n"; |
71 | QString install = "\nInstall\n"; | 75 | QString install = "\nInstall\n"; |
72 | QString upgrade = "\nUpgrade\n"; | 76 | QString upgrade = "\nUpgrade\n"; |
73 | for ( it = packageList.begin() ; it != packageList.end() ; ++it ) | 77 | for ( it = packageList.begin() ; it != packageList.end() ; ++it ) |
74 | { | 78 | { |
75 | QString name = *it; | 79 | QString name = *it; |
76 | if ( name.startsWith( "I" ) ) | 80 | if ( name.startsWith( "I" ) ) |
77 | { | 81 | { |
78 | installList.push_back( name.mid(1) ); | 82 | installList.push_back( name.mid(1) ); |
79 | install += " " + name.mid(1) + "\n"; | 83 | install += " " + name.mid(1) + "\n"; |
80 | } | 84 | } |
81 | else if ( name.startsWith( "D" ) ) | 85 | else if ( name.startsWith( "D" ) ) |
82 | { | 86 | { |
83 | removeList.push_back( name.mid(1) ); | 87 | removeList.push_back( name.mid(1) ); |
84 | remove += " " + name.mid(1) + "\n"; | 88 | remove += " " + name.mid(1) + "\n"; |
85 | } | 89 | } |
86 | else if ( name.startsWith( "U" ) ) | 90 | else if ( name.startsWith( "U" ) ) |
87 | { | 91 | { |
88 | updateList.push_back( name.mid(1) ); | 92 | updateList.push_back( name.mid(1) ); |
89 | upgrade += " " + name.mid(1) + "\n"; | 93 | upgrade += " " + name.mid(1) + "\n"; |
90 | } | 94 | } |
91 | } | 95 | } |
92 | 96 | ||
93 | output->setText( remove + install + upgrade ); | 97 | output->setText( remove + install + upgrade ); |
94 | 98 | ||
95 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | 99 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); |
96 | } | 100 | } |
97 | 101 | ||
98 | InstallDlgImpl::~InstallDlgImpl() | 102 | InstallDlgImpl::~InstallDlgImpl() |
99 | { | 103 | { |
100 | } | 104 | } |
101 | 105 | ||
102 | bool InstallDlgImpl :: showDlg() | 106 | bool InstallDlgImpl :: showDlg() |