author | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
commit | 1c58d1407f9584fedcdae390a04e2b37e5853361 (patch) (unidiff) | |
tree | 3c6e741c4d382d1a53c182930052b684d6e35b91 /noncore | |
parent | e3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (diff) | |
download | opie-1c58d1407f9584fedcdae390a04e2b37e5853361.zip opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.gz opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.bz2 |
Merge from BRANCH_1_0
46 files changed, 241 insertions, 272 deletions
diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp index c06f14f..4de6d12 100644 --- a/noncore/apps/advancedfm/filePermissions.cpp +++ b/noncore/apps/advancedfm/filePermissions.cpp | |||
@@ -15,3 +15,2 @@ | |||
15 | 15 | ||
16 | #include <qfile.h> | ||
17 | #include <qfileinfo.h> | 16 | #include <qfileinfo.h> |
@@ -21,5 +20,2 @@ | |||
21 | #include <qlineedit.h> | 20 | #include <qlineedit.h> |
22 | #include <qlayout.h> | ||
23 | #include <qvariant.h> | ||
24 | #include <qtooltip.h> | ||
25 | #include <qmessagebox.h> | 21 | #include <qmessagebox.h> |
@@ -250,3 +246,3 @@ void filePermissions::accept() { | |||
250 | perror("getpwnam"); | 246 | perror("getpwnam"); |
251 | QMessageBox::warning(this,"Warning","Error- no user"); | 247 | QMessageBox::warning(this,tr("Warning"),tr("Error- no user") ); |
252 | return; | 248 | return; |
@@ -256,3 +252,3 @@ void filePermissions::accept() { | |||
256 | perror("getgrnam"); | 252 | perror("getgrnam"); |
257 | QMessageBox::warning(this,"Warning","Error- no group"); | 253 | QMessageBox::warning(this,tr("Warning"),tr("Error- no group")); |
258 | return; | 254 | return; |
@@ -261,3 +257,3 @@ void filePermissions::accept() { | |||
261 | perror("chown"); | 257 | perror("chown"); |
262 | QMessageBox::warning(this,"Warning","Error setting ownership or group"); | 258 | QMessageBox::warning(this,tr("Warning"),tr("Error setting ownership or group") ); |
263 | return; | 259 | return; |
@@ -268,3 +264,3 @@ void filePermissions::accept() { | |||
268 | perror("chmod"); | 264 | perror("chmod"); |
269 | QMessageBox::warning(this,"Warning","Error setting mode"); | 265 | QMessageBox::warning(this,tr("Warning"),tr("Error setting mode") ); |
270 | return; | 266 | return; |
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp index a0401e8..8cacc4a 100644 --- a/noncore/apps/advancedfm/main.cpp +++ b/noncore/apps/advancedfm/main.cpp | |||
@@ -13,6 +13,2 @@ | |||
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #include <qpe/qcopenvelope_qws.h> | ||
15 | #include <qpe/config.h> | ||
16 | #include <qstring.h> | ||
17 | #include <qstringlist.h> | ||
18 | 14 | ||
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control index f17c590..1e0f9ec 100644 --- a/noncore/apps/advancedfm/opie-advancedfm.control +++ b/noncore/apps/advancedfm/opie-advancedfm.control | |||
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
@@ -10 +9,2 @@ Description: Advanced File Manager | |||
10 | The advanced file manager for the Opie environment. | 9 | The advanced file manager for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index a60cea6..33abdfc 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -9,3 +9,2 @@ | |||
9 | 9 | ||
10 | #include <qpe/filemanager.h> | ||
11 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
@@ -13,7 +12,3 @@ | |||
13 | 12 | ||
14 | #include <qmessagebox.h> | ||
15 | #include <qstringlist.h> | ||
16 | #include <qfile.h> | 13 | #include <qfile.h> |
17 | #include <qcstring.h> | ||
18 | #include <qlineedit.h> | ||
19 | #include <qmultilineedit.h> | 14 | #include <qmultilineedit.h> |
@@ -21,3 +16,2 @@ | |||
21 | #include <qlayout.h> | 16 | #include <qlayout.h> |
22 | #include <qvariant.h> | ||
23 | 17 | ||
@@ -171,6 +165,6 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
171 | 165 | ||
172 | OutputEdit->append("Process could not start"); | 166 | OutputEdit->append(tr("Process could not start") ); |
173 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 167 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
174 | perror("Error: "); | 168 | perror("Error: "); |
175 | QString errorMsg="Error\n"+(QString)strerror(errno); | 169 | QString errorMsg=tr("Error\n")+(QString)strerror(errno); |
176 | OutputEdit->append( errorMsg); | 170 | OutputEdit->append( errorMsg); |
@@ -247,3 +241,3 @@ void Output::processFinished() { | |||
247 | delete proc; | 241 | delete proc; |
248 | OutputEdit->append( "\nFinished\n"); | 242 | OutputEdit->append( tr("\nFinished\n") ); |
249 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 243 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control index c0061e5..78f303c 100644 --- a/noncore/apps/checkbook/opie-checkbook.control +++ b/noncore/apps/checkbook/opie-checkbook.control | |||
@@ -6,3 +6,2 @@ Maintainer: Dan Williams <drw@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, libopie1 | 7 | Depends: task-opie-minimal, libopie1 |
@@ -10 +9,2 @@ Description: Checkbook keeping program. | |||
10 | The checkbook accounting program for the Opie environment. | 9 | The checkbook accounting program for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp index 0bc6588..53b3853 100644 --- a/noncore/apps/opie-console/configdialog.cpp +++ b/noncore/apps/opie-console/configdialog.cpp | |||
@@ -77,3 +77,3 @@ void ConfigDialog::slotEdit() { | |||
77 | 77 | ||
78 | dlg.setCaption("Edit Connection Profile"); | 78 | dlg.setCaption(tr("Edit Connection Profile")); |
79 | dlg.showMaximized(); | 79 | dlg.showMaximized(); |
@@ -96,3 +96,3 @@ void ConfigDialog::slotAdd() { | |||
96 | 96 | ||
97 | dlg.setCaption("New Connection"); | 97 | dlg.setCaption(tr("New Connection")); |
98 | dlg.showMaximized(); | 98 | dlg.showMaximized(); |
diff --git a/noncore/apps/opie-console/consoleconfigwidget.cpp b/noncore/apps/opie-console/consoleconfigwidget.cpp index 3f2d154..faedc58 100644 --- a/noncore/apps/opie-console/consoleconfigwidget.cpp +++ b/noncore/apps/opie-console/consoleconfigwidget.cpp | |||
@@ -10,2 +10,6 @@ | |||
10 | 10 | ||
11 | #include <pwd.h> | ||
12 | #include <sys/types.h> | ||
13 | |||
14 | |||
11 | #include "consoleconfigwidget.h" | 15 | #include "consoleconfigwidget.h" |
@@ -67,7 +71,14 @@ void ConsoleConfigWidget::load( const Profile& prof ) { | |||
67 | /* | 71 | /* |
68 | * we will use /bin/bash as default | 72 | * default to the users default shell |
69 | * but will fallback in MyPty to /bin/sh | ||
70 | * if necessary | ||
71 | */ | 73 | */ |
72 | m_cmd->setText(prof.readEntry("Command", "/bin/bash")); | 74 | struct passwd *ent = 0; |
75 | char *shell = "/bin/sh"; | ||
76 | |||
77 | while ( (ent = getpwent()) != 0 ) { | ||
78 | if (ent->pw_shell != "") { | ||
79 | shell = ent->pw_shell; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | m_cmd->setText(prof.readEntry("Command", shell )); | ||
73 | int envcount = prof.readNumEntry("EnvVars", 0); | 84 | int envcount = prof.readNumEntry("EnvVars", 0); |
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp index b17f8e8..228db57 100644 --- a/noncore/apps/opie-console/main.cpp +++ b/noncore/apps/opie-console/main.cpp | |||
@@ -31,43 +31,41 @@ FixIt::FixIt() { | |||
31 | /* the new inittab */ | 31 | /* the new inittab */ |
32 | m_file = "#\n# /etc/inittab | 32 | m_file = "#\n# /etc/inittab" |
33 | # | 33 | "#" |
34 | 34 | "" | |
35 | # 0 - halt (Do NOT set initdefault to this) | 35 | "# 0 - halt (Do NOT set initdefault to this)" |
36 | # 1 - Single user mode | 36 | "# 1 - Single user mode" |
37 | # 2 - Multiuser, without NFS (The same as 3, if you do not have networking) | 37 | "# 2 - Multiuser, without NFS (The same as 3, if you do not have networking)" |
38 | # 3 - Full multiuser mode | 38 | "# 3 - Full multiuser mode" |
39 | # 4 - JavaVM(Intent) developer mode | 39 | "# 4 - JavaVM(Intent) developer mode" |
40 | # 5 - JavaVM(Intent) | 40 | "# 5 - JavaVM(Intent)" |
41 | # 6 - reboot (Do NOT set initdefault to this) | 41 | "# 6 - reboot (Do NOT set initdefault to this)" |
42 | # | 42 | "#" |
43 | id:5:initdefault: | 43 | "id:5:initdefault:" |
44 | 44 | "" | |
45 | # Specify things to do when starting | 45 | "# Specify things to do when starting" |
46 | si::sysinit:/etc/rc.d/rc.sysinit | 46 | "si::sysinit:/etc/rc.d/rc.sysinit" |
47 | 47 | "" | |
48 | l0:0:wait:/root/etc/rc.d/rc 0 | 48 | "l0:0:wait:/root/etc/rc.d/rc 0" |
49 | l1:1:wait:/etc/rc.d/rc 1 | 49 | "l1:1:wait:/etc/rc.d/rc 1" |
50 | l2:2:wait:/etc/rc.d/rc 2 | 50 | "l2:2:wait:/etc/rc.d/rc 2" |
51 | l3:3:wait:/etc/rc.d/rc 3 | 51 | "l3:3:wait:/etc/rc.d/rc 3" |
52 | l4:4:wait:/etc/rc.d/rc 4 | 52 | "l4:4:wait:/etc/rc.d/rc 4" |
53 | l5:5:wait:/etc/rc.d/rc 5 | 53 | "l5:5:wait:/etc/rc.d/rc 5" |
54 | l6:6:wait:/root/etc/rc.d/rc 6 | 54 | "l6:6:wait:/root/etc/rc.d/rc 6" |
55 | 55 | "" | |
56 | # Specify things to do before rebooting | 56 | "# Specify things to do before rebooting" |
57 | um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1 | 57 | "um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1" |
58 | sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1 | 58 | "sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1" |
59 | 59 | "" | |
60 | # Specify program to run on ttyS0 | 60 | "# Specify program to run on ttyS0" |
61 | s0:24:respawn:/sbin/getty 9600 ttyS0 | 61 | "s0:24:respawn:/sbin/getty 9600 ttyS0" |
62 | #pd:5:respawn:/etc/sync/serialctl | 62 | "#pd:5:respawn:/etc/sync/serialctl" |
63 | 63 | "" | |
64 | # Specify program to run on tty1 | 64 | "# Specify program to run on tty1" |
65 | 1:2:respawn:/sbin/getty 9600 tty1 | 65 | "1:2:respawn:/sbin/getty 9600 tty1" |
66 | ln:345:respawn:survive -l 6 /sbin/launch | 66 | "ln:345:respawn:survive -l 6 /sbin/launch" |
67 | #qt:5:respawn:/sbin/qt | 67 | "#qt:5:respawn:/sbin/qt" |
68 | 68 | "" | |
69 | # collie sp. | 69 | "# collie sp." |
70 | sy::respawn:/sbin/shsync\n"; | 70 | "sy::respawn:/sbin/shsync\n"; |
71 | |||
72 | |||
73 | } | 71 | } |
@@ -91,3 +89,2 @@ void FixIt::fixIt() { | |||
91 | 89 | ||
92 | |||
93 | int main(int argc, char **argv) { | 90 | int main(int argc, char **argv) { |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index c48116d..3c9603c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -86,3 +86,3 @@ void MainWindow::initUI() { | |||
86 | */ | 86 | */ |
87 | QAction* newCon = new QAction(tr("New Connection"), | 87 | QAction* newCon = new QAction(tr("New Profile"), |
88 | Resource::loadPixmap( "new" ), | 88 | Resource::loadPixmap( "new" ), |
@@ -95,3 +95,3 @@ void MainWindow::initUI() { | |||
95 | 95 | ||
96 | QAction *saveCon = new QAction(tr("Save Connection"), | 96 | QAction *saveCon = new QAction( tr("Save Profile" ), |
97 | Resource::loadPixmap( "save" ), QString::null, | 97 | Resource::loadPixmap( "save" ), QString::null, |
@@ -430,2 +430,3 @@ void MainWindow::slotQuickLaunch() { | |||
430 | create( newProf ); | 430 | create( newProf ); |
431 | slotSaveSession(); | ||
431 | } | 432 | } |
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control index 693c72c..852451d 100644 --- a/noncore/apps/opie-console/opie-console.control +++ b/noncore/apps/opie-console/opie-console.control | |||
@@ -7,3 +7,3 @@ Architecture: arm | |||
7 | Version: 0.6-$SUB_VERSION | 7 | Version: 0.6-$SUB_VERSION |
8 | Depends: qpe-base, libopie1, lrzsz, opie-keytabs | 8 | Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs |
9 | License: GPL | 9 | License: GPL |
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index 58b29ca..ccf2e08 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro | |||
@@ -13,3 +13,2 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ | |||
13 | profilemanager.h \ | 13 | profilemanager.h \ |
14 | configwidget.h \ | ||
15 | tabwidget.h \ | 14 | tabwidget.h \ |
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 6b607df..e2501a6 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp | |||
@@ -37,3 +37,3 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) | |||
37 | // Default profile | 37 | // Default profile |
38 | m_prof = Profile("New Profile", "serial", "default", Profile::Black, Profile::White, Profile::VT102); | 38 | m_prof = Profile(tr("New Profile"), "serial", "default", Profile::Black, Profile::White, Profile::VT102); |
39 | 39 | ||
@@ -125,4 +125,2 @@ void ProfileEditorDialog::initUI() | |||
125 | m_name->setText(m_prof.name()); | 125 | m_name->setText(m_prof.name()); |
126 | slotConActivated( m_fact->external(m_prof.ioLayerName() ) ); | ||
127 | slotTermActivated( m_fact->external(m_prof.terminalName() ) ); | ||
128 | slotKeyActivated( "Default Keyboard" ); | 126 | slotKeyActivated( "Default Keyboard" ); |
@@ -130,2 +128,4 @@ void ProfileEditorDialog::initUI() | |||
130 | setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); | 128 | setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); |
129 | slotConActivated( m_fact->external(m_prof.ioLayerName() ) ); | ||
130 | slotTermActivated( m_fact->external(m_prof.terminalName() ) ); | ||
131 | m_autoConnect->setChecked(m_prof.autoConnect()); | 131 | m_autoConnect->setChecked(m_prof.autoConnect()); |
@@ -201,6 +201,9 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) { | |||
201 | // supports auto connect and then set it as prefered | 201 | // supports auto connect and then set it as prefered |
202 | //if ( ( )->layer()->supports()[0] == 1 ) { | ||
203 | if ( m_conCmb ->currentText() == tr("Local Console") ) { | 202 | if ( m_conCmb ->currentText() == tr("Local Console") ) { |
204 | m_autoConnect->setChecked( true ); | 203 | m_autoConnect->setChecked( true ); |
204 | m_prof.writeEntry("Terminal", Profile::Linux ); | ||
205 | slotTermActivated( m_fact->external (m_prof.terminalName() ) ); | ||
205 | } else { | 206 | } else { |
207 | m_prof.writeEntry("Terminal", Profile::VT102 ); | ||
208 | slotTermActivated( m_fact->external (m_prof.terminalName() ) ); | ||
206 | m_autoConnect->setChecked( false ); | 209 | m_autoConnect->setChecked( false ); |
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp index 825608e..e5320d9 100644 --- a/noncore/apps/opie-reader/Prefs.cpp +++ b/noncore/apps/opie-reader/Prefs.cpp | |||
@@ -33,3 +33,3 @@ CLayoutPrefs::CLayoutPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
33 | QHBoxLayout* hb = new QHBoxLayout(this); | 33 | QHBoxLayout* hb = new QHBoxLayout(this); |
34 | QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, "Text", this); | 34 | QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this); |
35 | hb->addWidget(bg); | 35 | hb->addWidget(bg); |
@@ -367,3 +367,3 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
367 | 367 | ||
368 | QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, "Select Action", this); | 368 | QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, tr("Select Action"), this); |
369 | hl->addWidget( gb, 0, 0 ); | 369 | hl->addWidget( gb, 0, 0 ); |
@@ -379,3 +379,3 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
379 | 379 | ||
380 | QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, "Plucker", this); | 380 | QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, tr("Plucker"), this); |
381 | hl->addWidget( bg, 0 , 1 ); | 381 | hl->addWidget( bg, 0 , 1 ); |
@@ -486,3 +486,3 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
486 | 486 | ||
487 | gb = new QGroupBox(1, Qt::Horizontal, "Dictionary", this); | 487 | gb = new QGroupBox(1, Qt::Horizontal, tr("Dictionary"), this); |
488 | 488 | ||
@@ -502,3 +502,3 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
502 | SwapMouse = new QCheckBox( gb ); | 502 | SwapMouse = new QCheckBox( gb ); |
503 | SwapMouse->setText("Swap Tap\nActions"); | 503 | SwapMouse->setText(tr("Swap Tap\nActions") ); |
504 | 504 | ||
@@ -525,20 +525,20 @@ void CButtonPrefs::populate(MenuButton *mb) | |||
525 | mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | 525 | mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); |
526 | mb->insertItem("<Nothing>"); | 526 | mb->insertItem(tr("<Nothing>") ); |
527 | mb->insertItem("Open file"); | 527 | mb->insertItem(tr("Open file") ); |
528 | mb->insertItem("Autoscroll"); | 528 | mb->insertItem(tr("Autoscroll") ); |
529 | mb->insertItem("Bookmark"); | 529 | mb->insertItem(tr("Bookmark") ); |
530 | mb->insertItem("Annotate"); | 530 | mb->insertItem(tr("Annotate") ); |
531 | mb->insertItem("Fullscreen"); | 531 | mb->insertItem(tr("Fullscreen") ); |
532 | 532 | ||
533 | mb->insertItem("Zoom in"); | 533 | mb->insertItem(tr("Zoom in") ); |
534 | mb->insertItem("Zoom out"); | 534 | mb->insertItem(tr("Zoom out") ); |
535 | mb->insertItem("Back"); | 535 | mb->insertItem(tr("Back") ); |
536 | mb->insertItem("Forward"); | 536 | mb->insertItem(tr("Forward") ); |
537 | mb->insertItem("Home"); | 537 | mb->insertItem(tr("Home") ); |
538 | mb->insertItem("Page up"); | 538 | mb->insertItem(tr("Page up") ); |
539 | mb->insertItem("Page down"); | 539 | mb->insertItem(tr("Page down") ); |
540 | mb->insertItem("Line up"); | 540 | mb->insertItem(tr("Line up") ); |
541 | mb->insertItem("Line down"); | 541 | mb->insertItem(tr("Line down") ); |
542 | mb->insertItem("Beginning"); | 542 | mb->insertItem(tr("Beginning") ); |
543 | mb->insertItem("End"); | 543 | mb->insertItem(tr("End") ); |
544 | } | 544 | } |
@@ -553,3 +553,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
553 | 553 | ||
554 | QLabel* ql = new QLabel("Escape Button", this); | 554 | QLabel* ql = new QLabel(tr("Escape Button"), this); |
555 | hl->addWidget(ql, 0, 0, Qt::AlignBottom); | 555 | hl->addWidget(ql, 0, 0, Qt::AlignBottom); |
@@ -563,3 +563,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
563 | 563 | ||
564 | ql = new QLabel("Space Button", this); | 564 | ql = new QLabel(tr("Space Button"), this); |
565 | hl->addWidget(ql, 2, 0, Qt::AlignBottom); | 565 | hl->addWidget(ql, 2, 0, Qt::AlignBottom); |
@@ -573,3 +573,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
573 | 573 | ||
574 | ql = new QLabel("Return Button", this); | 574 | ql = new QLabel(tr("Return Button"), this); |
575 | hl->addWidget(ql, 2, 1, Qt::AlignBottom); | 575 | hl->addWidget(ql, 2, 1, Qt::AlignBottom); |
@@ -583,3 +583,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
583 | 583 | ||
584 | ql = new QLabel("Left Arrow", this); | 584 | ql = new QLabel(tr("Left Arrow"), this); |
585 | hl->addWidget(ql, 4, 0, Qt::AlignBottom); | 585 | hl->addWidget(ql, 4, 0, Qt::AlignBottom); |
@@ -595,3 +595,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
595 | 595 | ||
596 | ql = new QLabel("Right Arrow", this); | 596 | ql = new QLabel(tr("Right Arrow"), this); |
597 | hl->addWidget(ql, 4, 1, Qt::AlignBottom); | 597 | hl->addWidget(ql, 4, 1, Qt::AlignBottom); |
@@ -607,3 +607,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
607 | 607 | ||
608 | ql = new QLabel("Down Arrow", this); | 608 | ql = new QLabel(tr("Down Arrow"), this); |
609 | hl->addWidget(ql, 7, 0, Qt::AlignBottom); | 609 | hl->addWidget(ql, 7, 0, Qt::AlignBottom); |
@@ -619,3 +619,3 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
619 | 619 | ||
620 | ql = new QLabel("Up Arrow", this); | 620 | ql = new QLabel(tr("Up Arrow"), this); |
621 | hl->addWidget(ql, 7, 1, Qt::AlignBottom); | 621 | hl->addWidget(ql, 7, 1, Qt::AlignBottom); |
diff --git a/noncore/apps/opie-reader/Prefs.h b/noncore/apps/opie-reader/Prefs.h index 37d8c9e..8fef2f5 100644 --- a/noncore/apps/opie-reader/Prefs.h +++ b/noncore/apps/opie-reader/Prefs.h | |||
@@ -37,3 +37,3 @@ class CLayoutPrefs : public QWidget | |||
37 | { | 37 | { |
38 | 38 | Q_OBJECT | |
39 | public: | 39 | public: |
@@ -58,3 +58,3 @@ class CLayoutPrefs2 : public QWidget | |||
58 | { | 58 | { |
59 | 59 | Q_OBJECT | |
60 | public: | 60 | public: |
@@ -101,3 +101,3 @@ class CMiscPrefs : public QWidget | |||
101 | { | 101 | { |
102 | 102 | Q_OBJECT | |
103 | public: | 103 | public: |
@@ -115,2 +115,3 @@ class CButtonPrefs : public QWidget | |||
115 | { | 115 | { |
116 | Q_OBJECT | ||
116 | #ifdef USECOMBO | 117 | #ifdef USECOMBO |
@@ -137,3 +138,3 @@ class CInterPrefs : public QWidget | |||
137 | { | 138 | { |
138 | 139 | Q_OBJECT | |
139 | public: | 140 | public: |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index af1da27..087ce00 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -2603,3 +2603,3 @@ void QTReaderApp::updateCaption() | |||
2603 | // s = tr( "Unnamed" ); | 2603 | // s = tr( "Unnamed" ); |
2604 | setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) ); | 2604 | setCaption( reader->m_string + " - " + tr("Reader") ); |
2605 | // } | 2605 | // } |
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h index 297d63a..9571c28 100644 --- a/noncore/apps/opie-reader/ToolbarPrefs.h +++ b/noncore/apps/opie-reader/ToolbarPrefs.h | |||
@@ -173,3 +173,3 @@ class CMiscBarPrefs : public QWidget | |||
173 | { | 173 | { |
174 | 174 | Q_OBJECT | |
175 | public: | 175 | public: |
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control index 9996297..b7b0e8f 100644 --- a/noncore/apps/opie-reader/opie-reader.control +++ b/noncore/apps/opie-reader/opie-reader.control | |||
@@ -6,3 +6,2 @@ Maintainer: Tim Wentford <timwentford@hotmail.com> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
@@ -10 +9,2 @@ License: GPL | |||
10 | Description: E-Book reader | 9 | Description: E-Book reader |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control index 52b518a..7b37671 100644 --- a/noncore/apps/opie-write/opie-write.control +++ b/noncore/apps/opie-write/opie-write.control | |||
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
@@ -10 +9,2 @@ Description: Rich Text Editor | |||
10 | The rich text editor for the Opie environment. | 9 | The rich text editor for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control index 1eff80b..6d40d1b 100644 --- a/noncore/apps/oxygen/opie-oxygen.control +++ b/noncore/apps/oxygen/opie-oxygen.control | |||
@@ -6,3 +6,2 @@ Maintainer: Carsten Niehaus <cniehaus@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
@@ -10 +9,2 @@ Description: Periodic System of the Elements | |||
10 | The chemistry application for the Opie-environment | 9 | The chemistry application for the Opie-environment |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control index b5495e1..aba9b8d 100644 --- a/noncore/apps/tableviewer/opie-tableviewer.control +++ b/noncore/apps/tableviewer/opie-tableviewer.control | |||
@@ -7,3 +7,2 @@ Architecture: arm | |||
7 | Arch: iPAQ | 7 | Arch: iPAQ |
8 | Version: $QPE_VERSION-$SUB_VERSION | ||
9 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
@@ -11 +10,2 @@ Description: XML database browsers | |||
11 | A table/database viewer for the Opie environment. | 10 | A table/database viewer for the Opie environment. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp index 38ba55d..22a4917 100644 --- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp +++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp | |||
@@ -123,3 +123,3 @@ KWBuffer::count() | |||
123 | { | 123 | { |
124 | // qDebug("m_stringList.count %d",m_stringList.count()); | 124 | qDebug("m_stringList.count %d",m_stringList.count()); |
125 | return m_lineCount; | 125 | return m_lineCount; |
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp index 844f27d..f90a5f8 100644 --- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp +++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp | |||
@@ -73,3 +73,3 @@ void SyntaxDocument::setupModeList(bool force) | |||
73 | mli->extension = config->readEntry("extension",""); | 73 | mli->extension = config->readEntry("extension",""); |
74 | mli->identifier = *it; | 74 | mli->identifier = path+*it; |
75 | myModeList.append(mli); | 75 | myModeList.append(mli); |
@@ -107,2 +107,3 @@ void SyntaxDocument::setupModeList(bool force) | |||
107 | } | 107 | } |
108 | config->write(); | ||
108 | // config->sync(); | 109 | // config->sync(); |
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro index 5cb0b14..b282059 100644 --- a/noncore/apps/tinykate/libkate/libkate.pro +++ b/noncore/apps/tinykate/libkate/libkate.pro | |||
@@ -27,2 +27,4 @@ HEADERS = microkde/kapplication.h \ | |||
27 | microkde/kcolorbtn.h \ | 27 | microkde/kcolorbtn.h \ |
28 | \ | ||
29 | \ | ||
28 | qt3back/qregexp3.h \ | 30 | qt3back/qregexp3.h \ |
@@ -51,2 +53,3 @@ SOURCES = microkde/kapplication.cpp \ | |||
51 | microkde/kurlrequester.cpp \ | 53 | microkde/kurlrequester.cpp \ |
54 | microkde/kcolordialog.cpp \ | ||
52 | microkde/kfontdialog.cpp \ | 55 | microkde/kfontdialog.cpp \ |
@@ -57,2 +60,4 @@ SOURCES = microkde/kapplication.cpp \ | |||
57 | microkde/kcolorbtn.cpp \ | 60 | microkde/kcolorbtn.cpp \ |
61 | \ | ||
62 | \ | ||
58 | qt3back/qregexp3.cpp \ | 63 | qt3back/qregexp3.cpp \ |
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 976f1db..5d21f15 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |||
@@ -25,7 +25,5 @@ | |||
25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
26 | //#include "kcolordialog.h" | 26 | #include "kcolordialog.h" |
27 | #include "kcolorbtn.h" | 27 | #include "kcolorbtn.h" |
28 | 28 | ||
29 | #include <opie/colordialog.h> | ||
30 | |||
31 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 29 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
@@ -77,6 +75,7 @@ void KColorButton::chooseColor() | |||
77 | { | 75 | { |
78 | QColor newCol=OColorDialog::getColor( col); | 76 | if( KColorDialog::getColor( col) == QDialog::Rejected ) |
79 | if( newCol != QDialog::Rejected ) | ||
80 | { | 77 | { |
81 | col=newCol; | 78 | return; |
79 | } | ||
80 | |||
82 | repaint( false ); | 81 | repaint( false ); |
@@ -84,3 +83,2 @@ void KColorButton::chooseColor() | |||
84 | } | 83 | } |
85 | } | ||
86 | 84 | ||
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h index 1d5c27e..0f831cd 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h +++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h | |||
@@ -4,7 +4,5 @@ | |||
4 | #include <qcolor.h> | 4 | #include <qcolor.h> |
5 | #include <opie/colordialog.h> | ||
6 | 5 | ||
7 | class KColorDialog : OColorDialog | 6 | class KColorDialog |
8 | { | 7 | { |
9 | Q_OBJECT | ||
10 | public: | 8 | public: |
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp index de81d0f..af3b30d 100644 --- a/noncore/apps/tinykate/libkate/view/kateview.cpp +++ b/noncore/apps/tinykate/libkate/view/kateview.cpp | |||
@@ -2198,3 +2198,4 @@ bool KateView::askReplaceEnd() { | |||
2198 | "Continue from the beginning?").arg(replaces); | 2198 | "Continue from the beginning?").arg(replaces); |
2199 | query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); | 2199 | query = KMessageBox::questionYesNo(this, str, i18n("Replace"), |
2200 | i18n("Continue"), i18n("Stop")); | ||
2200 | } else { | 2201 | } else { |
@@ -2204,3 +2205,4 @@ bool KateView::askReplaceEnd() { | |||
2204 | "Continue from the end?").arg(replaces); | 2205 | "Continue from the end?").arg(replaces); |
2205 | query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); | 2206 | query = KMessageBox::questionYesNo(this, str, i18n("Replace"), |
2207 | i18n("Continue"), i18n("Stop")); | ||
2206 | } | 2208 | } |
@@ -2268,3 +2270,2 @@ void KateView::configDialog() | |||
2268 | #warning fixme | 2270 | #warning fixme |
2269 | QScrollView *pScroll; | ||
2270 | 2271 | ||
@@ -2305,5 +2306,4 @@ void KateView::configDialog() | |||
2305 | (new QVBoxLayout(page))->setAutoAdd(true); | 2306 | (new QVBoxLayout(page))->setAutoAdd(true); |
2306 | pScroll=new QScrollView(page); | 2307 | |
2307 | EditConfigTab *editConfig = new EditConfigTab(page, this); | 2308 | EditConfigTab *editConfig = new EditConfigTab(page, this); |
2308 | pScroll->addChild(editConfig); | ||
2309 | 2309 | ||
@@ -2327,6 +2327,4 @@ void KateView::configDialog() | |||
2327 | (new QVBoxLayout(page))->setAutoAdd(true); | 2327 | (new QVBoxLayout(page))->setAutoAdd(true); |
2328 | pScroll=new QScrollView(page); | ||
2329 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, pScroll->viewport()); | ||
2330 | pScroll->addChild(hlPage); | ||
2331 | 2328 | ||
2329 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page); | ||
2332 | kd->showMaximized(); | 2330 | kd->showMaximized(); |
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp index e92df69..e06668a 100644 --- a/noncore/apps/tinykate/main.cpp +++ b/noncore/apps/tinykate/main.cpp | |||
@@ -24,5 +24,4 @@ int main( int argc, char ** argv ) | |||
24 | 24 | ||
25 | TinyKate *m = new TinyKate(); | 25 | TinyKate m; |
26 | a.setMainWidget( m ); | 26 | a.showMainWidget(&m ); |
27 | m->showMaximized(); | ||
28 | return a.exec(); | 27 | return a.exec(); |
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control index 76704c1..dd5e24b 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for for common programming languages for TinyKate | 8 | Description: Syntax Highlighting Patterns for for common programming languages for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control index 9f60156..c47acc0 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for document oriented languages for TinyKate | 8 | Description: Syntax Highlighting Patterns for document oriented languages for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control index 4e0f529..0e80518 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for misc languages for TinyKate | 8 | Description: Syntax Highlighting Patterns for misc languages for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control index 3c8f61a..3f7ea0d 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate | 8 | Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control index 36e88b5..ea4e026 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate | 8 | Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control index 46fe64a..8f9c71a 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, opie-tinykate | 7 | Depends: task-opie-minimal, opie-tinykate |
9 | Description: Syntax Highlighting Patterns for for common programming languages for TinyKate | 8 | Description: Syntax Highlighting Patterns for for common programming languages for TinyKate |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control index c4156fc..712933c 100644 --- a/noncore/apps/tinykate/opie-tinykate-syntax.control +++ b/noncore/apps/tinykate/opie-tinykate-syntax.control | |||
@@ -5,3 +5,2 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web | 6 | Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web |
@@ -9 +8,2 @@ Description: Syntax Highlighting Patterns virtual package, which installs all av | |||
9 | Files: | 8 | Files: |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control index 95dd7e0..731375c 100644 --- a/noncore/apps/tinykate/opie-tinykate.control +++ b/noncore/apps/tinykate/opie-tinykate.control | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Kate for opie | 8 | Description: Kate for opie |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp index dda8405..f470645 100644 --- a/noncore/apps/tinykate/tinykate.cpp +++ b/noncore/apps/tinykate/tinykate.cpp | |||
@@ -10,3 +10,3 @@ | |||
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free softwaSre; 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 * |
@@ -19,4 +19,4 @@ | |||
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qpe/qpetoolbar.h> | 20 | #include <qtoolbutton.h> |
21 | #include <qpe/qpemenubar.h> | 21 | #include <qmenubar.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
@@ -27,4 +27,2 @@ | |||
27 | 27 | ||
28 | #include "cgotoline.h" | ||
29 | |||
30 | #include "tinykate.h" | 28 | #include "tinykate.h" |
@@ -39,2 +37,3 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
39 | { | 37 | { |
38 | shutDown=false; | ||
40 | nextUnnamed=0; | 39 | nextUnnamed=0; |
@@ -42,12 +41,6 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
42 | viewCount=0; | 41 | viewCount=0; |
43 | setCaption("TinyKATE : line 1 col 1"); | 42 | setCaption(tr("TinyKATE")); |
44 | KGlobal::setAppName("TinyKATE"); | 43 | KGlobal::setAppName("TinyKATE"); |
45 | 44 | ||
46 | curLine=curCol=1; | 45 | QMenuBar *mb = new QMenuBar( this ); |
47 | |||
48 | setToolBarsMovable(FALSE); | ||
49 | |||
50 | QPEToolBar *bar = new QPEToolBar( this ); | ||
51 | bar->setHorizontalStretchable( TRUE ); | ||
52 | QPEMenuBar *mb = new QPEMenuBar( bar ); | ||
53 | mb->setMargin( 0 ); | 46 | mb->setMargin( 0 ); |
@@ -62,3 +55,3 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
62 | // Action for creating a new document | 55 | // Action for creating a new document |
63 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, CTRL+Key_N, this, 0 ); | 56 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
64 | a->addTo( popup ); | 57 | a->addTo( popup ); |
@@ -67,3 +60,3 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
67 | // Action for opening an exisiting document | 60 | // Action for opening an exisiting document |
68 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, CTRL+Key_O, this, 0 ); | 61 | a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 ); |
69 | a->addTo(popup); | 62 | a->addTo(popup); |
@@ -73,3 +66,3 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
73 | // Action for saving document | 66 | // Action for saving document |
74 | a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ), QString::null, CTRL+Key_S, this, 0 ); | 67 | a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 ); |
75 | a->addTo(popup); | 68 | a->addTo(popup); |
@@ -83,3 +76,3 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
83 | // Action for closing the currently active document | 76 | // Action for closing the currently active document |
84 | a = new QAction( tr( "Close" ), Resource::loadPixmap( "close" ), QString::null, CTRL+Key_W, this, 0 ); | 77 | a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 ); |
85 | a->addTo(popup); | 78 | a->addTo(popup); |
@@ -93,27 +86,30 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
93 | // Action for cutting text | 86 | // Action for cutting text |
94 | editCut = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, CTRL+Key_X, this, 0 ); | 87 | editCut = new QToolButton( 0 ); |
95 | editCut->addTo( bar ); | 88 | editCut->setAutoRaise( true ); |
89 | editCut->setIconSet( Resource::loadPixmap( "cut" ) ); | ||
96 | 90 | ||
97 | // Action for Copying text | 91 | // Action for Copying text |
98 | editCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, CTRL+Key_C, this, 0 ); | 92 | editCopy = new QToolButton( 0 ); |
99 | editCopy->addTo( bar ); | 93 | editCopy->setAutoRaise( true ); |
94 | editCopy->setIconSet( Resource::loadPixmap( "copy" ) ); | ||
100 | 95 | ||
101 | // Action for pasting text | 96 | // Action for pasting text |
102 | editPaste = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, CTRL+Key_V, this, 0 ); | 97 | editPaste = new QToolButton( 0 ); |
103 | editPaste->addTo( bar ); | 98 | editPaste->setAutoRaise( true ); |
104 | 99 | editPaste->setIconSet( Resource::loadPixmap( "paste" ) ); | |
105 | 100 | ||
106 | // Action for finding / replacing text | 101 | // Action for finding / replacing text |
107 | editFindReplace = new QAction( tr( "Replace" ), Resource::loadPixmap("find"), QString::null, CTRL+Key_R, this, 0 ); | 102 | editFindReplace = new QToolButton( 0 ); |
108 | editFind = new QAction( tr( "Find" ), Resource::loadPixmap("find"), QString::null, CTRL+Key_F, this, 0 ); | 103 | editFindReplace->setAutoRaise( true ); |
109 | editFind->addTo( bar ); | 104 | editFindReplace->setIconSet( Resource::loadPixmap("find") ); |
110 | 105 | ||
111 | // Action for undo | 106 | // Action for undo |
112 | editUndo = new QAction( tr( "Undo" ), Resource::loadPixmap( "undo" ), QString::null, CTRL+Key_Z, this, 0 ); | 107 | editUndo = new QToolButton( 0 ); |
113 | editUndo->addTo( bar ); | 108 | editUndo->setAutoRaise( true ); |
109 | editUndo->setIconSet( Resource::loadPixmap( "undo" ) ); | ||
114 | 110 | ||
115 | // Action for redo | 111 | // Action for redo |
116 | editRedo = new QAction( tr( "Redo" ), Resource::loadPixmap( "redo" ), QString::null, CTRL+SHIFT+Key_Z, this, 0 ); | 112 | editRedo = new QToolButton( 0 ); |
117 | editRedo->addTo( bar ); | 113 | editRedo->setAutoRaise( true ); |
118 | 114 | editRedo->setIconSet( Resource::loadPixmap( "redo" ) ); | |
119 | 115 | ||
@@ -122,6 +118,2 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
122 | 118 | ||
123 | a = new QAction( tr( "Goto" ), QString::null, CTRL+Key_G, this, 0 ); | ||
124 | a->addTo( popup ); | ||
125 | connect(a, SIGNAL(activated()), this, SLOT(slotGoTo())); | ||
126 | |||
127 | viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); | 119 | viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); |
@@ -134,4 +126,2 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
134 | 126 | ||
135 | |||
136 | |||
137 | popup = new QPopupMenu( this ); | 127 | popup = new QPopupMenu( this ); |
@@ -139,2 +129,11 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
139 | 129 | ||
130 | |||
131 | mb->insertItem( editCut ); | ||
132 | mb->insertItem( editCopy ); | ||
133 | mb->insertItem( editPaste ); | ||
134 | mb->insertItem( editFindReplace ); | ||
135 | mb->insertItem( editUndo ); | ||
136 | mb->insertItem( editRedo ); | ||
137 | |||
138 | |||
140 | //Highlight management | 139 | //Highlight management |
@@ -152,6 +151,2 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
152 | 151 | ||
153 | popup->insertSeparator(); | ||
154 | editFind->addTo(popup); | ||
155 | editFindReplace->addTo(popup); | ||
156 | |||
157 | if( qApp->argc() > 1) open(qApp->argv()[1]); | 152 | if( qApp->argc() > 1) open(qApp->argv()[1]); |
@@ -164,5 +159,9 @@ TinyKate::~TinyKate( ) | |||
164 | qWarning("TinyKate destructor\n"); | 159 | qWarning("TinyKate destructor\n"); |
165 | printf("~TinyKate()\n"); | 160 | |
161 | shutDown=true; | ||
162 | while (currentView!=0) { | ||
163 | slotClose(); | ||
164 | } | ||
165 | |||
166 | if( KGlobal::config() != 0 ) { | 166 | if( KGlobal::config() != 0 ) { |
167 | printf("~TinyKate(): delete configs...\n"); | ||
168 | qWarning("deleting KateConfig object..\n"); | 167 | qWarning("deleting KateConfig object..\n"); |
@@ -195,6 +194,5 @@ void TinyKate::open(const QString & filename) | |||
195 | 194 | ||
196 | void TinyKate::setDocument(const QString &doc) | 195 | void TinyKate::setDocument(const QString& fileref) |
197 | { | 196 | { |
198 | printf("tinykate: setDocument(\"%s\")\n",(const char*)doc); | 197 | open( fileref ); |
199 | open(doc); | ||
200 | } | 198 | } |
@@ -210,4 +208,2 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
210 | disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); | 208 | disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); |
211 | disconnect(editFindReplace,SIGNAL(activated()),currentView,SLOT(replace())); | ||
212 | disconnect(editFind,SIGNAL(activated()),currentView,SLOT(find())); | ||
213 | disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); | 209 | disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); |
@@ -216,3 +212,2 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
216 | disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); | 212 | disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); |
217 | disconnect(currentView,SIGNAL(newCurPos()),this,SLOT(slotCursorMoved())); | ||
218 | } | 213 | } |
@@ -221,9 +216,7 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
221 | 216 | ||
222 | connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); | 217 | connect(editCopy,SIGNAL(clicked()),currentView,SLOT(copy())); |
223 | connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); | 218 | connect(editCut,SIGNAL(clicked()),currentView,SLOT(cut())); |
224 | connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); | 219 | connect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste())); |
225 | connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); | 220 | connect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo())); |
226 | connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); | 221 | connect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo())); |
227 | connect(editFindReplace,SIGNAL(activated()),currentView,SLOT(replace())); | ||
228 | connect(editFind,SIGNAL(activated()),currentView,SLOT(find())); | ||
229 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); | 222 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); |
@@ -232,3 +225,3 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
232 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); | 225 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); |
233 | connect(currentView,SIGNAL(newCurPos()),this,SLOT(slotCursorMoved())); | 226 | |
234 | } | 227 | } |
@@ -253,3 +246,3 @@ void TinyKate::slotClose( ) | |||
253 | viewCount--; | 246 | viewCount--; |
254 | if (!viewCount) slotNew(); | 247 | if ((!viewCount) && (!shutDown)) slotNew(); |
255 | } | 248 | } |
@@ -290,32 +283 @@ void TinyKate::slotSaveAs() { | |||
290 | } | } | |
291 | |||
292 | void TinyKate::slotGoTo() | ||
293 | { | ||
294 | int l,c; | ||
295 | if (currentView==0) return; | ||
296 | |||
297 | currentView->getCursorPosition(&l,&c); | ||
298 | |||
299 | CGotoLine g(l); | ||
300 | |||
301 | if(g.exec()==QDialog::Accepted) | ||
302 | { | ||
303 | currentView->setCursorPosition( g.line(), c ); | ||
304 | } | ||
305 | } | ||
306 | |||
307 | void TinyKate::slotCursorMoved() | ||
308 | { | ||
309 | char buf[100]; | ||
310 | int newLine,newCol; | ||
311 | currentView->getCursorPosition(&newLine,&newCol); | ||
312 | newLine++; | ||
313 | newCol++; | ||
314 | if((newLine!=curLine)||(newCol!=curCol)) | ||
315 | { | ||
316 | sprintf(buf,"TinyKATE : line %-6d col %d",newLine,newCol); | ||
317 | setCaption(buf); | ||
318 | curLine=newLine; | ||
319 | curCol=newCol; | ||
320 | } | ||
321 | } | ||
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h index 077d5f0..2bf4de6 100644 --- a/noncore/apps/tinykate/tinykate.h +++ b/noncore/apps/tinykate/tinykate.h | |||
@@ -25,5 +25,5 @@ | |||
25 | 25 | ||
26 | class QToolButton; | ||
26 | class QAction; | 27 | class QAction; |
27 | class QPopupMenu; | 28 | class QPopupMenu; |
28 | class CGotoLine; | ||
29 | 29 | ||
@@ -38,2 +38,3 @@ public slots: | |||
38 | void slotNew(); | 38 | void slotNew(); |
39 | void setDocument(const QString& fileref); | ||
39 | 40 | ||
@@ -45,6 +46,2 @@ protected slots: | |||
45 | void slotSaveAs(); | 46 | void slotSaveAs(); |
46 | void slotGoTo(); | ||
47 | void slotCursorMoved(); | ||
48 | void setDocument(const QString &doc); | ||
49 | |||
50 | protected: | 47 | protected: |
@@ -55,13 +52,6 @@ private: | |||
55 | KTextEditor::View *currentView; | 52 | KTextEditor::View *currentView; |
53 | bool shutDown; | ||
56 | 54 | ||
57 | QAction *editCopy; | 55 | QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo, *editFindReplace; |
58 | QAction *editCut; | 56 | QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings; |
59 | QAction *editPaste; | ||
60 | QAction *editUndo; | ||
61 | QAction *editRedo; | ||
62 | QAction *editFind; | ||
63 | QAction *editFindReplace; | ||
64 | QAction *viewIncFontSizes; | ||
65 | QAction *viewDecFontSizes; | ||
66 | QAction *utilSettings; | ||
67 | 57 | ||
@@ -70,3 +60,2 @@ private: | |||
70 | uint viewCount; | 60 | uint viewCount; |
71 | int curLine,curCol; | ||
72 | }; | 61 | }; |
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro index f7ff451..632bd49 100644 --- a/noncore/apps/tinykate/tinykate.pro +++ b/noncore/apps/tinykate/tinykate.pro | |||
@@ -3,5 +3,5 @@ CONFIG = qt warn_on release | |||
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = tinykate.h cgotoline.h | 4 | HEADERS = tinykate.h |
5 | SOURCES = tinykate.cpp main.cpp cgotoline.cpp | 5 | SOURCES = tinykate.cpp main.cpp |
6 | INTERFACES = cgotobase.ui | 6 | INTERFACES= |
7 | INCLUDEPATH += $(OPIEDIR)/include \ | 7 | INCLUDEPATH += $(OPIEDIR)/include \ |
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 45a6663..42093cf 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -1014,2 +1014,7 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1014 | newitem->option = "D"; | 1014 | newitem->option = "D"; |
1015 | |||
1016 | // If local file, remove using package name, not filename | ||
1017 | if ( p->isPackageStoredLocally() ) | ||
1018 | name = item->text(); | ||
1019 | |||
1015 | if ( !p->isPackageStoredLocally() ) | 1020 | if ( !p->isPackageStoredLocally() ) |
@@ -1043,2 +1048,6 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1043 | newitem->option = "D"; | 1048 | newitem->option = "D"; |
1049 | |||
1050 | // If local file, remove using package name, not filename | ||
1051 | if ( p->isPackageStoredLocally() ) | ||
1052 | name = item->text(); | ||
1044 | } | 1053 | } |
@@ -1082,2 +1091,5 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1082 | newitem->option = "D"; | 1091 | newitem->option = "D"; |
1092 | // If local file, remove using package name, not filename | ||
1093 | if ( p->isPackageStoredLocally() ) | ||
1094 | name = item->text(); | ||
1083 | break; | 1095 | break; |
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control index b8ad1e8..46bffdd 100644 --- a/noncore/settings/aqpkg/opie-aqpkg.control +++ b/noncore/settings/aqpkg/opie-aqpkg.control | |||
@@ -4,3 +4,2 @@ Priority: optional | |||
4 | Section: Settings | 4 | Section: Settings |
5 | Version: $QPE_VERSION-$SUB_VERSION | ||
6 | Depends: task-opie-minimal | 5 | Depends: task-opie-minimal |
@@ -11 +10,2 @@ Description: A Package Manager | |||
11 | 10 | ||
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp index adda832..5a521d3 100644 --- a/noncore/settings/aqpkg/package.cpp +++ b/noncore/settings/aqpkg/package.cpp | |||
@@ -118,2 +118,3 @@ void Package :: setVersion( const QString &v ) | |||
118 | version = v; | 118 | version = v; |
119 | differentVersionAvailable = false; | ||
119 | 120 | ||
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp index 9553cd1..499d647 100644 --- a/noncore/settings/aqpkg/packagewin.cpp +++ b/noncore/settings/aqpkg/packagewin.cpp | |||
@@ -46,7 +46,8 @@ PackageWindow::PackageWindow( Package *package, const QString &server ) | |||
46 | { | 46 | { |
47 | Package *local = package->getLocalPackage(); | ||
47 | setCaption( package->getPackageName() ); | 48 | setCaption( package->getPackageName() ); |
48 | QString destName; | 49 | QString destName; |
49 | if ( package->getLocalPackage() ) | 50 | if ( local ) |
50 | { | 51 | { |
51 | if ( package->getLocalPackage()->getInstalledTo() ) | 52 | if ( local->getInstalledTo() ) |
52 | destName = package->getLocalPackage()->getInstalledTo()->getDestinationName(); | 53 | destName = package->getLocalPackage()->getInstalledTo()->getDestinationName(); |
@@ -88,3 +89,3 @@ PackageWindow::PackageWindow( Package *package, const QString &server ) | |||
88 | str.append( package->getVersion() ); | 89 | str.append( package->getVersion() ); |
89 | if ( package->getLocalPackage() ) | 90 | if ( local ) |
90 | { | 91 | { |
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 4693db1..0282236 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
@@ -121,3 +121,3 @@ void Server :: readLocalIpks( Server *local ) | |||
121 | // Changed to display the filename (excluding the path) | 121 | // Changed to display the filename (excluding the path) |
122 | QString packageName = Utils::getFilenameFromIpkFilename( file ); | 122 | QString packageName = Utils::getPackageNameFromIpkFilename( file ); |
123 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); | 123 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); |
@@ -246,2 +246,5 @@ void Server :: buildLocalPackages( Server *local ) | |||
246 | QListIterator<Package> it( packageList ); | 246 | QListIterator<Package> it( packageList ); |
247 | |||
248 | QList<Package> *locallist = &local->getPackageList(); | ||
249 | |||
247 | for ( ; it.current(); ++it ) | 250 | for ( ; it.current(); ++it ) |
@@ -261,2 +264,10 @@ void Server :: buildLocalPackages( Server *local ) | |||
261 | { | 264 | { |
265 | // Replace local version | ||
266 | if ( curr->getVersion() > p->getVersion() ) | ||
267 | { | ||
268 | int pos = locallist->at(); | ||
269 | locallist->remove( p ); | ||
270 | locallist->insert( pos, curr ); | ||
271 | } | ||
272 | |||
262 | // Set some default stuff like size and things | 273 | // Set some default stuff like size and things |
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp index 3d127a8..8def0d6 100644 --- a/noncore/settings/sysinfo/modulesinfo.cpp +++ b/noncore/settings/sysinfo/modulesinfo.cpp | |||
@@ -50,3 +50,3 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) | |||
50 | ModulesView->setColumnAlignment( colnum, Qt::AlignRight ); | 50 | ModulesView->setColumnAlignment( colnum, Qt::AlignRight ); |
51 | colnum = ModulesView->addColumn( tr( "Used By" ) ); | 51 | colnum = ModulesView->addColumn( tr( "Used by" ) ); |
52 | ModulesView->setAllColumnsShowFocus( TRUE ); | 52 | ModulesView->setAllColumnsShowFocus( TRUE ); |
@@ -143,5 +143,3 @@ void ModulesInfo::slotSendClicked() | |||
143 | 143 | ||
144 | QString capstr = tr( "You really want to execute\n" ); | 144 | QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() ); |
145 | capstr.append( CommandCB->currentText() ); | ||
146 | capstr.append( "\nfor this module?" ); | ||
147 | 145 | ||
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control index acb51e5..8250174 100644 --- a/noncore/settings/sysinfo/opie-sysinfo.control +++ b/noncore/settings/sysinfo/opie-sysinfo.control | |||
@@ -6,3 +6,2 @@ Maintainer: Dan Williams <williamsdr@acm.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, libopie1 | 7 | Depends: task-opie-minimal, libopie1 |
@@ -10 +9,2 @@ Description: System Information dialog | |||
10 | For the Opie environment. | 9 | For the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp index 1de1a19..8dec9be 100644 --- a/noncore/settings/sysinfo/processinfo.cpp +++ b/noncore/settings/sysinfo/processinfo.cpp | |||
@@ -166,5 +166,3 @@ void ProcessInfo::slotSendClicked() | |||
166 | 166 | ||
167 | QString capstr = tr( "You really want to send\n" ); | 167 | QString capstr = tr( "You really want to send %1 to this process?" ).arg( SignalCB->currentText() ); |
168 | capstr.append( SignalCB->currentText() ); | ||
169 | capstr.append( "\nto this process?" ); | ||
170 | 168 | ||