author | zecke <zecke> | 2004-09-10 11:11:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 11:11:23 (UTC) |
commit | 532d65f8a45850bfda3c3344a7b165af91e48440 (patch) (unidiff) | |
tree | cbda2467001ed9a5be304fa52cabbb797b56ecfe /noncore/apps/opie-gutenbrowser | |
parent | e64d9e9682e0afefc4fbebe7ba9737e0f86e3ed7 (diff) | |
download | opie-532d65f8a45850bfda3c3344a7b165af91e48440.zip opie-532d65f8a45850bfda3c3344a7b165af91e48440.tar.gz opie-532d65f8a45850bfda3c3344a7b165af91e48440.tar.bz2 |
Add newlines, remove unused local variables, remove unused parameters,
add newlines at the end of file...
Diffstat (limited to 'noncore/apps/opie-gutenbrowser') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/NetworkDialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/fontDialog.cpp | 40 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/helpwindow.cpp | 2 |
4 files changed, 23 insertions, 23 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp index 124b6f3..020a116 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | |||
@@ -1,86 +1,86 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | // LibraryDialog.cpp - description | 2 | // LibraryDialog.cpp - description |
3 | // ------------------- | 3 | // ------------------- |
4 | // begin : Sat Aug 19 2000 | 4 | // begin : Sat Aug 19 2000 |
5 | // copyright : (C) 2000 - 2004 by llornkcor | 5 | // copyright : (C) 2000 - 2004 by llornkcor |
6 | // email : ljp@llornkcor.com | 6 | // email : ljp@llornkcor.com |
7 | // ***************************************************/ | 7 | // ***************************************************/ |
8 | // /*************************************************************************** | 8 | // /*************************************************************************** |
9 | // * This program is free software; you can redistribute it and/or modify * | 9 | // * This program is free software; you can redistribute it and/or modify * |
10 | // * it under the terms of the GNU General Public License as published by * | 10 | // * it under the terms of the GNU General Public License as published by * |
11 | // * the Free Software Foundation; either version 2 of the License, or * | 11 | // * the Free Software Foundation; either version 2 of the License, or * |
12 | // * (at your option) any later version. * | 12 | // * (at your option) any later version. * |
13 | // ***************************************************************************/ | 13 | // ***************************************************************************/ |
14 | //ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL | 14 | //ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL |
15 | 15 | ||
16 | #include "LibraryDialog.h" | 16 | #include "LibraryDialog.h" |
17 | #include "output.h" | 17 | #include "output.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | #include <qpe/qpedialog.h> | 22 | #include <qpe/qpedialog.h> |
23 | #include <opie2/odebug.h> | 23 | #include <opie2/odebug.h> |
24 | 24 | ||
25 | /* QT */ | 25 | /* QT */ |
26 | #include <qpushbutton.h> | 26 | #include <qpushbutton.h> |
27 | #include <qmultilineedit.h> | 27 | #include <qmultilineedit.h> |
28 | //#include <qlayout.h> | 28 | //#include <qlayout.h> |
29 | 29 | ||
30 | /* STD */ | 30 | /* STD */ |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #include <stdio.h> | 32 | #include <stdio.h> |
33 | #include <stdlib.h> | 33 | #include <stdlib.h> |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * The dialog will by default be modeless, unless you set 'modal' to | 36 | * The dialog will by default be modeless, unless you set 'modal' to |
37 | * TRUE to construct a modal dialog. */ | 37 | * TRUE to construct a modal dialog. */ |
38 | LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, WFlags fl ) | 38 | LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool /*modal*/, WFlags fl ) |
39 | : QDialog( parent, name, true/* modal*/, fl ) | 39 | : QDialog( parent, name, true/* modal*/, fl ) |
40 | { | 40 | { |
41 | if ( !name ) | 41 | if ( !name ) |
42 | setName( "LibraryDialog" ); | 42 | setName( "LibraryDialog" ); |
43 | indexLoaded=false; | 43 | indexLoaded=false; |
44 | initDialog(); | 44 | initDialog(); |
45 | 45 | ||
46 | // this->setMaximumWidth(240); | 46 | // this->setMaximumWidth(240); |
47 | 47 | ||
48 | index = "GUTINDEX.ALL"; | 48 | index = "GUTINDEX.ALL"; |
49 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; | 49 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; |
50 | local_index = local_library + index; | 50 | local_index = local_library + index; |
51 | 51 | ||
52 | QString iniFile ; | 52 | QString iniFile ; |
53 | iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc"; | 53 | iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc"; |
54 | 54 | ||
55 | new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT"; | 55 | new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT"; |
56 | 56 | ||
57 | old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL"; | 57 | old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL"; |
58 | // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; | 58 | // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; |
59 | 59 | ||
60 | // iniFile = local_library+"gutenbrowserrc"; | 60 | // iniFile = local_library+"gutenbrowserrc"; |
61 | // new_index = local_library + "PGWHOLE.TXT"; | 61 | // new_index = local_library + "PGWHOLE.TXT"; |
62 | // old_index = local_library + "GUTINDEX.ALL"; | 62 | // old_index = local_library + "GUTINDEX.ALL"; |
63 | 63 | ||
64 | Config config("Gutenbrowser"); | 64 | Config config("Gutenbrowser"); |
65 | 65 | ||
66 | config.setGroup( "HttpServer" ); | 66 | config.setGroup( "HttpServer" ); |
67 | proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org"); | 67 | proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org"); |
68 | 68 | ||
69 | config.setGroup( "FTPsite" ); | 69 | config.setGroup( "FTPsite" ); |
70 | ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org"); | 70 | ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org"); |
71 | odebug << "Library Dialog: ftp_host is "+ftp_host << oendl; | 71 | odebug << "Library Dialog: ftp_host is "+ftp_host << oendl; |
72 | // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) ); | 72 | // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) ); |
73 | // ftp_host=ftp_host.stripWhiteSpace(); | 73 | // ftp_host=ftp_host.stripWhiteSpace(); |
74 | ftp_base_dir= config.readEntry("base", "/pub/gutenberg"); | 74 | ftp_base_dir= config.readEntry("base", "/pub/gutenberg"); |
75 | 75 | ||
76 | i_binary = 0; | 76 | i_binary = 0; |
77 | 77 | ||
78 | config.setGroup("SortAuth"); | 78 | config.setGroup("SortAuth"); |
79 | if( config.readEntry("authSort", "FALSE") == "TRUE") | 79 | if( config.readEntry("authSort", "FALSE") == "TRUE") |
80 | authBox->setChecked(TRUE); | 80 | authBox->setChecked(TRUE); |
81 | 81 | ||
82 | config.setGroup("General"); | 82 | config.setGroup("General"); |
83 | downDir =config.readEntry( "DownloadDirectory",local_library); | 83 | downDir =config.readEntry( "DownloadDirectory",local_library); |
84 | odebug << "downDir is "+downDir << oendl; | 84 | odebug << "downDir is "+downDir << oendl; |
85 | newindexLib.setName( old_index); | 85 | newindexLib.setName( old_index); |
86 | indexLib.setName( old_index); | 86 | indexLib.setName( old_index); |
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp index af14aac..a321952 100644 --- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp | |||
@@ -1,91 +1,91 @@ | |||
1 | // /*************************************************************************** | 1 | // /*************************************************************************** |
2 | // NetworkDialog.cpp - description | 2 | // NetworkDialog.cpp - description |
3 | // begin : Sun Aug 27 2000 | 3 | // begin : Sun Aug 27 2000 |
4 | // copyright : (C) 2000 - 2004 by L.J. Potter | 4 | // copyright : (C) 2000 - 2004 by L.J. Potter |
5 | // email : ljp@llornkcor.com | 5 | // email : ljp@llornkcor.com |
6 | // * This program is free software; you can redistribute it and/or modify * | 6 | // * This program is free software; you can redistribute it and/or modify * |
7 | // * it under the terms of the GNU General Public License as published by * | 7 | // * it under the terms of the GNU General Public License as published by * |
8 | // * the Free Software Foundation; either version 2 of the License, or * | 8 | // * the Free Software Foundation; either version 2 of the License, or * |
9 | // * (at your option) any later version. * | 9 | // * (at your option) any later version. * |
10 | // ***************************************************************************/ | 10 | // ***************************************************************************/ |
11 | // // half-assed attempt at providing a network dialog. | 11 | // // half-assed attempt at providing a network dialog. |
12 | // /* Created: Sun Aug 27 15:24:52 2000*/ | 12 | // /* Created: Sun Aug 27 15:24:52 2000*/ |
13 | 13 | ||
14 | 14 | ||
15 | #include "NetworkDialog.h" | 15 | #include "NetworkDialog.h" |
16 | #include "gutenbrowser.h" | 16 | #include "gutenbrowser.h" |
17 | 17 | ||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/odebug.h> | 19 | #include <opie2/odebug.h> |
20 | 20 | ||
21 | /* QT */ | 21 | /* QT */ |
22 | #include <qprogressbar.h> | 22 | #include <qprogressbar.h> |
23 | #include <qstringlist.h> | 23 | #include <qstringlist.h> |
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qvaluelist.h> | 25 | #include <qvaluelist.h> |
26 | #include <qapplication.h> | 26 | #include <qapplication.h> |
27 | #include <qfile.h> | 27 | #include <qfile.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qlabel.h> | 29 | #include <qlabel.h> |
30 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | 32 | ||
33 | /* STD */ | 33 | /* STD */ |
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ftplib.h> | 36 | #include <ftplib.h> |
37 | } | 37 | } |
38 | 38 | ||
39 | QProgressBar* ProgressBar1; | 39 | QProgressBar* ProgressBar1; |
40 | QPushButton* buttonCancel; | 40 | QPushButton* buttonCancel; |
41 | static netbuf *conn = NULL; | 41 | static netbuf *conn = NULL; |
42 | 42 | ||
43 | static int log_progress(netbuf *ctl, int xfered, void *arg) { | 43 | static int log_progress(netbuf *, int xfered, void *arg) { |
44 | int fsz = *(int *)arg; | 44 | int fsz = *(int *)arg; |
45 | int pct = (xfered * 100) / fsz; | 45 | int pct = (xfered * 100) / fsz; |
46 | printf("%3d%%\r", pct); | 46 | printf("%3d%%\r", pct); |
47 | fflush(stdout); | 47 | fflush(stdout); |
48 | ProgressBar1->setProgress(xfered); | 48 | ProgressBar1->setProgress(xfered); |
49 | qApp->processEvents(); | 49 | qApp->processEvents(); |
50 | 50 | ||
51 | return 1; | 51 | return 1; |
52 | } | 52 | } |
53 | 53 | ||
54 | NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL) | 54 | NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL) |
55 | : QDialog( parent, name, modal, fl ) | 55 | : QDialog( parent, name, modal, fl ) |
56 | { | 56 | { |
57 | 57 | ||
58 | ftp_host = netL[0]; | 58 | ftp_host = netL[0]; |
59 | networkUrl = strUrl = netL[0]; | 59 | networkUrl = strUrl = netL[0]; |
60 | 60 | ||
61 | dir = ftp_base_dir = netL[1]; | 61 | dir = ftp_base_dir = netL[1]; |
62 | localFileName = netL[2]; | 62 | localFileName = netL[2]; |
63 | s_partialFileName = netL[3]; | 63 | s_partialFileName = netL[3]; |
64 | 64 | ||
65 | resize(240,120); | 65 | resize(240,120); |
66 | 66 | ||
67 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; | 67 | local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; |
68 | // autoOk = autoDownload; | 68 | // autoOk = autoDownload; |
69 | // if( networkUrl.find("ftp",0,false)== -1 ) { | 69 | // if( networkUrl.find("ftp",0,false)== -1 ) { |
70 | // if ( !name ) | 70 | // if ( !name ) |
71 | // setName( "HTTP NetworkDialog" ); | 71 | // setName( "HTTP NetworkDialog" ); |
72 | // setCaption( tr( "HTTP Download ) ); | 72 | // setCaption( tr( "HTTP Download ) ); |
73 | // qInitNetworkProtocols(); // registers ftp protocol // for now | 73 | // qInitNetworkProtocols(); // registers ftp protocol // for now |
74 | // QNetworkProtocol::registerNetworkProtocol( "http", new QNetworkProtocolFactory<Http> ); | 74 | // QNetworkProtocol::registerNetworkProtocol( "http", new QNetworkProtocolFactory<Http> ); |
75 | // } else { | 75 | // } else { |
76 | if ( !name ) | 76 | if ( !name ) |
77 | setName( "FTP NetworkDialog" ); | 77 | setName( "FTP NetworkDialog" ); |
78 | setCaption(tr("FTP Download")); | 78 | setCaption(tr("FTP Download")); |
79 | // } | 79 | // } |
80 | initDialog(); //opens file to be written | 80 | initDialog(); //opens file to be written |
81 | } | 81 | } |
82 | 82 | ||
83 | NetworkDialog::~NetworkDialog() { | 83 | NetworkDialog::~NetworkDialog() { |
84 | } | 84 | } |
85 | 85 | ||
86 | void NetworkDialog::initDialog() { | 86 | void NetworkDialog::initDialog() { |
87 | 87 | ||
88 | QGridLayout *layout = new QGridLayout( this ); | 88 | QGridLayout *layout = new QGridLayout( this ); |
89 | totalBytesDownloaded=0; | 89 | totalBytesDownloaded=0; |
90 | warnLabel = new QLabel( this, "TextLabel" ); | 90 | warnLabel = new QLabel( this, "TextLabel" ); |
91 | warnLabel ->setText( tr( "Download should start shortly" ) ); | 91 | warnLabel ->setText( tr( "Download should start shortly" ) ); |
diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp index fa964a6..c6d0fe6 100644 --- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp | |||
@@ -10,251 +10,251 @@ copyright 2002 by L.J. Potter ljp@llornkcor.com | |||
10 | #include <qpe/fontdatabase.h> | 10 | #include <qpe/fontdatabase.h> |
11 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
12 | 12 | ||
13 | #include <qstringlist.h> | 13 | #include <qstringlist.h> |
14 | #include <qfontinfo.h> | 14 | #include <qfontinfo.h> |
15 | #include <qvaluelist.h> | 15 | #include <qvaluelist.h> |
16 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
17 | 17 | ||
18 | #include <qgroupbox.h> | 18 | #include <qgroupbox.h> |
19 | #include <qlabel.h> | 19 | #include <qlabel.h> |
20 | #include <qlistbox.h> | 20 | #include <qlistbox.h> |
21 | #include <qmultilineedit.h> | 21 | #include <qmultilineedit.h> |
22 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
23 | #include <qlayout.h> | 23 | #include <qlayout.h> |
24 | #include <qvariant.h> | 24 | #include <qvariant.h> |
25 | #include <qtooltip.h> | 25 | #include <qtooltip.h> |
26 | #include <qwhatsthis.h> | 26 | #include <qwhatsthis.h> |
27 | #include <qcombobox.h> | 27 | #include <qcombobox.h> |
28 | 28 | ||
29 | //#define BUGGY_SHARP_ZAURUS 0 | 29 | //#define BUGGY_SHARP_ZAURUS 0 |
30 | 30 | ||
31 | static const int nfontsizes = 9; | 31 | static const int nfontsizes = 9; |
32 | static const int fontsize[nfontsizes] = {8,9,10,11,12,13,14,18,24}; | 32 | static const int fontsize[nfontsizes] = {8,9,10,11,12,13,14,18,24}; |
33 | 33 | ||
34 | 34 | ||
35 | FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFlags fl */) | 35 | FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFlags fl */) |
36 | :/* QDialog*/ QWidget( parent, name /*, modal, fl */) | 36 | :/* QDialog*/ QWidget( parent, name /*, modal, fl */) |
37 | { | 37 | { |
38 | if ( !name ) | 38 | if ( !name ) |
39 | setName( "FontDialog" ); | 39 | setName( "FontDialog" ); |
40 | setCaption( tr( "Font Dialog" ) ); | 40 | setCaption( tr( "Font Dialog" ) ); |
41 | 41 | ||
42 | QGridLayout *layout = new QGridLayout( this ); | 42 | QGridLayout *layout = new QGridLayout( this ); |
43 | layout->setSpacing(2); | 43 | layout->setSpacing(2); |
44 | layout->setMargin(2); | 44 | layout->setMargin(2); |
45 | 45 | ||
46 | familyListBox = new QListBox( this, "familyListBox" ); | 46 | familyListBox = new QListBox( this, "familyListBox" ); |
47 | layout->addMultiCellWidget( familyListBox, 0, 2, 0, 0); | 47 | layout->addMultiCellWidget( familyListBox, 0, 2, 0, 0); |
48 | 48 | ||
49 | QBoxLayout * hbox = new QHBoxLayout(this); | 49 | QBoxLayout * hbox = new QHBoxLayout(this); |
50 | QBoxLayout * vbox = new QVBoxLayout(this); | 50 | QBoxLayout * vbox = new QVBoxLayout(this); |
51 | 51 | ||
52 | styleListBox = new QListBox( this, "styleListBox" ); | 52 | styleListBox = new QListBox( this, "styleListBox" ); |
53 | vbox->addWidget( styleListBox, 0); | 53 | vbox->addWidget( styleListBox, 0); |
54 | 54 | ||
55 | FontTextLabel4 = new QLabel( this, "TextLabel4" ); | 55 | FontTextLabel4 = new QLabel( this, "TextLabel4" ); |
56 | FontTextLabel4->setText( tr( "Size" ) ); | 56 | FontTextLabel4->setText( tr( "Size" ) ); |
57 | hbox->addWidget( FontTextLabel4,0); | 57 | hbox->addWidget( FontTextLabel4,0); |
58 | 58 | ||
59 | sizeComboBox = new QComboBox( FALSE, this, "SizeCombo"); | 59 | sizeComboBox = new QComboBox( FALSE, this, "SizeCombo"); |
60 | // sizeComboBox->setMaximumWidth(60); | 60 | // sizeComboBox->setMaximumWidth(60); |
61 | hbox->addWidget( sizeComboBox, 0); | 61 | hbox->addWidget( sizeComboBox, 0); |
62 | 62 | ||
63 | vbox->addLayout(hbox,0); | 63 | vbox->addLayout(hbox,0); |
64 | layout->addLayout( vbox,0,3); | 64 | layout->addLayout( vbox,0,3); |
65 | 65 | ||
66 | MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" ); | 66 | MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" ); |
67 | MultiLineEdit1->setText( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ) ); | 67 | MultiLineEdit1->setText( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ) ); |
68 | MultiLineEdit1->setWordWrap( QMultiLineEdit::WidgetWidth); | 68 | MultiLineEdit1->setWordWrap( QMultiLineEdit::WidgetWidth); |
69 | 69 | ||
70 | layout->addMultiCellWidget( MultiLineEdit1, 4, 4, 0, 3); | 70 | layout->addMultiCellWidget( MultiLineEdit1, 4, 4, 0, 3); |
71 | 71 | ||
72 | connect(familyListBox,SIGNAL(highlighted(const QString &)),SLOT(familyListBoxSlot(const QString &))); | 72 | connect(familyListBox,SIGNAL(highlighted(const QString &)),SLOT(familyListBoxSlot(const QString &))); |
73 | connect(styleListBox,SIGNAL(highlighted(const QString &)),SLOT(styleListBoxSlot(const QString &))); | 73 | connect(styleListBox,SIGNAL(highlighted(const QString &)),SLOT(styleListBoxSlot(const QString &))); |
74 | connect(sizeComboBox,SIGNAL(activated(const QString &)),SLOT(sizeComboBoxSlot(const QString &))); | 74 | connect(sizeComboBox,SIGNAL(activated(const QString &)),SLOT(sizeComboBoxSlot(const QString &))); |
75 | 75 | ||
76 | populateLists(); | 76 | populateLists(); |
77 | 77 | ||
78 | } | 78 | } |
79 | 79 | ||
80 | FontDialog::~FontDialog() | 80 | FontDialog::~FontDialog() |
81 | { | 81 | { |
82 | } | 82 | } |
83 | 83 | ||
84 | void FontDialog::familyListBoxSlot(const QString & text) | 84 | void FontDialog::familyListBoxSlot(const QString & text) |
85 | { | 85 | { |
86 | int styleInt = styleListBox->currentItem(); | 86 | int styleInt = styleListBox->currentItem(); |
87 | int sizeInt = sizeComboBox->currentText().toInt(); | 87 | int sizeInt = sizeComboBox->currentText().toInt(); |
88 | 88 | ||
89 | sizeComboBox->clear(); | 89 | sizeComboBox->clear(); |
90 | styleListBox->clear(); | 90 | styleListBox->clear(); |
91 | // clearListBoxes(); | 91 | // clearListBoxes(); |
92 | family = text; | 92 | family = text; |
93 | // odebug << family << oendl; | 93 | // odebug << family << oendl; |
94 | QStringList styles = fdb.styles( family ); // string list of styles of our current font family | 94 | QStringList styles = fdb.styles( family ); // string list of styles of our current font family |
95 | styleListBox->insertStringList( styles); | 95 | styleListBox->insertStringList( styles); |
96 | QString dstyle;// = "\t" + style + " ("; | 96 | QString dstyle;// = "\t" + style + " ("; |
97 | 97 | ||
98 | #ifdef BUGGY_SHARP_ZAURUS | 98 | #ifdef BUGGY_SHARP_ZAURUS |
99 | 99 | ||
100 | QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) ); | 100 | QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) ); |
101 | for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { | 101 | for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { |
102 | dstyle = QString::number( *points ); | 102 | dstyle = QString::number( *points ); |
103 | odebug << dstyle << oendl; | 103 | odebug << dstyle << oendl; |
104 | sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 )); | 104 | sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 )); |
105 | } | 105 | } |
106 | #else | 106 | #else |
107 | 107 | ||
108 | for (int i=0; i<nfontsizes; i++) { | 108 | for (int i=0; i<nfontsizes; i++) { |
109 | sizeComboBox->insertItem( QString::number(fontsize[i])); | 109 | sizeComboBox->insertItem( QString::number(fontsize[i])); |
110 | if(fontsize[i] == sizeInt) { | 110 | if(fontsize[i] == sizeInt) { |
111 | sizeComboBox->setCurrentItem(i); | 111 | sizeComboBox->setCurrentItem(i); |
112 | } | 112 | } |
113 | } | 113 | } |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | if(styleInt == -1 || styleInt > styleListBox->count() ) | 116 | if(styleInt == -1 || styleInt > static_cast<int>(styleListBox->count()) ) |
117 | styleListBox->setCurrentItem(0); | 117 | styleListBox->setCurrentItem(0); |
118 | else | 118 | else |
119 | styleListBox->setCurrentItem(styleInt); | 119 | styleListBox->setCurrentItem(styleInt); |
120 | 120 | ||
121 | changeText(); | 121 | changeText(); |
122 | } | 122 | } |
123 | 123 | ||
124 | void FontDialog::styleListBoxSlot(const QString &text) | 124 | void FontDialog::styleListBoxSlot(const QString &) |
125 | { | 125 | { |
126 | changeText(); | 126 | changeText(); |
127 | } | 127 | } |
128 | 128 | ||
129 | void FontDialog::sizeComboBoxSlot(const QString & text) | 129 | void FontDialog::sizeComboBoxSlot(const QString &) |
130 | { | 130 | { |
131 | changeText(); | 131 | changeText(); |
132 | } | 132 | } |
133 | 133 | ||
134 | void FontDialog::populateLists() | 134 | void FontDialog::populateLists() |
135 | { | 135 | { |
136 | // QFont defaultFont=MultiLineEdit1->font(); | 136 | // QFont defaultFont=MultiLineEdit1->font(); |
137 | // QFont defaultFont=Lview->font(); | 137 | // QFont defaultFont=Lview->font(); |
138 | // QFontInfo fontInfo(defaultFont); | 138 | // QFontInfo fontInfo(defaultFont); |
139 | Config config("Gutenbrowser"); | 139 | Config config("Gutenbrowser"); |
140 | config.setGroup("Font"); | 140 | config.setGroup("Font"); |
141 | QString familyStr = config.readEntry("Family", "fixed"); | 141 | QString familyStr = config.readEntry("Family", "fixed"); |
142 | QString styleStr = config.readEntry("Style", "Regular"); | 142 | QString styleStr = config.readEntry("Style", "Regular"); |
143 | QString sizeStr = config.readEntry("Size", "10"); | 143 | QString sizeStr = config.readEntry("Size", "10"); |
144 | QString charSetStr = config.readEntry("CharSet", "iso10646-1" ); | 144 | QString charSetStr = config.readEntry("CharSet", "iso10646-1" ); |
145 | bool ok; | 145 | bool ok; |
146 | int i_size = sizeStr.toInt(&ok,10); | 146 | int i_size = sizeStr.toInt(&ok,10); |
147 | selectedFont = fdb.font(familyStr,styleStr,i_size,charSetStr); | 147 | selectedFont = fdb.font(familyStr,styleStr,i_size,charSetStr); |
148 | // defaultFont.setItalic(TRUE); | 148 | // defaultFont.setItalic(TRUE); |
149 | families = fdb.families(); | 149 | families = fdb.families(); |
150 | 150 | ||
151 | for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) { | 151 | for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) { |
152 | QString family = *f; | 152 | QString family = *f; |
153 | // if(family == defaultFont.family()) | 153 | // if(family == defaultFont.family()) |
154 | // odebug << family << oendl; | 154 | // odebug << family << oendl; |
155 | familyListBox->insertItem( family); | 155 | familyListBox->insertItem( family); |
156 | 156 | ||
157 | if( familyListBox->text(0) == family) { | 157 | if( familyListBox->text(0) == family) { |
158 | QStringList styles = fdb.styles( family ); | 158 | QStringList styles = fdb.styles( family ); |
159 | // string list of styles of our current font family | 159 | // string list of styles of our current font family |
160 | styleListBox->insertStringList( styles); | 160 | styleListBox->insertStringList( styles); |
161 | 161 | ||
162 | for ( QStringList::Iterator s = styles.begin(); s != styles.end();++s ) { // for each font style | 162 | for ( QStringList::Iterator s = styles.begin(); s != styles.end();++s ) { // for each font style |
163 | style = *s; | 163 | style = *s; |
164 | QString dstyle;// = "\t" + style + " ("; | 164 | QString dstyle;// = "\t" + style + " ("; |
165 | if(styleListBox->text(0) == style) { | 165 | if(styleListBox->text(0) == style) { |
166 | 166 | ||
167 | QValueList<int> smoothies = fdb.smoothSizes( family, style ); | 167 | QValueList<int> smoothies = fdb.smoothSizes( family, style ); |
168 | for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { | 168 | for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { |
169 | dstyle = QString::number( *points ) + " "; | 169 | dstyle = QString::number( *points ) + " "; |
170 | sizeComboBox ->insertItem( dstyle.left( dstyle.length() - 1 )); | 170 | sizeComboBox ->insertItem( dstyle.left( dstyle.length() - 1 )); |
171 | } | 171 | } |
172 | dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; | 172 | dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; |
173 | } | 173 | } |
174 | } // styles | 174 | } // styles |
175 | } | 175 | } |
176 | } | 176 | } |
177 | for(int i=0;i < familyListBox->count();i++) { | 177 | for(uint i=0;i < familyListBox->count();i++) { |
178 | if( familyListBox->text(i) == familyStr) | 178 | if( familyListBox->text(i) == familyStr) |
179 | familyListBox->setSelected( i, TRUE); | 179 | familyListBox->setSelected( i, TRUE); |
180 | } | 180 | } |
181 | 181 | ||
182 | for(int i=0;i < styleListBox->count();i++) { | 182 | for(uint i=0;i < styleListBox->count();i++) { |
183 | if( styleListBox->text(i) == styleStr) | 183 | if( styleListBox->text(i) == styleStr) |
184 | styleListBox->setSelected( i, TRUE); | 184 | styleListBox->setSelected( i, TRUE); |
185 | } | 185 | } |
186 | 186 | ||
187 | for (int i=0; i<sizeComboBox->count(); i++) { | 187 | for (int i=0; i<sizeComboBox->count(); i++) { |
188 | 188 | ||
189 | #ifdef BUGGY_SHARP_ZAURUS | 189 | #ifdef BUGGY_SHARP_ZAURUS |
190 | if(sizeComboBox->text(i) == sizeStr) | 190 | if(sizeComboBox->text(i) == sizeStr) |
191 | #else | 191 | #else |
192 | if(fontsize[i] == i_size) | 192 | if(fontsize[i] == i_size) |
193 | #endif | 193 | #endif |
194 | sizeComboBox->setCurrentItem(i); | 194 | sizeComboBox->setCurrentItem(i); |
195 | } | 195 | } |
196 | changeText(); | 196 | changeText(); |
197 | } | 197 | } |
198 | 198 | ||
199 | void FontDialog::clearListBoxes() { | 199 | void FontDialog::clearListBoxes() { |
200 | familyListBox->clear(); | 200 | familyListBox->clear(); |
201 | sizeComboBox->clear(); | 201 | sizeComboBox->clear(); |
202 | styleListBox->clear(); | 202 | styleListBox->clear(); |
203 | } | 203 | } |
204 | 204 | ||
205 | void FontDialog::changeText() | 205 | void FontDialog::changeText() |
206 | { | 206 | { |
207 | if( familyListBox->currentItem() == -1) | 207 | if( familyListBox->currentItem() == -1) |
208 | family= familyListBox->text(0); | 208 | family= familyListBox->text(0); |
209 | else { | 209 | else { |
210 | family = familyListBox->currentText(); | 210 | family = familyListBox->currentText(); |
211 | } | 211 | } |
212 | // odebug << "Font family is "+family << oendl; | 212 | // odebug << "Font family is "+family << oendl; |
213 | if( styleListBox->currentItem() == -1) | 213 | if( styleListBox->currentItem() == -1) |
214 | style=styleListBox->text(0); | 214 | style=styleListBox->text(0); |
215 | else { | 215 | else { |
216 | style = styleListBox->currentText(); | 216 | style = styleListBox->currentText(); |
217 | } | 217 | } |
218 | // odebug << "font style is "+style << oendl; | 218 | // odebug << "font style is "+style << oendl; |
219 | 219 | ||
220 | if( sizeComboBox->currentItem() == -1 ) | 220 | if( sizeComboBox->currentItem() == -1 ) |
221 | size = sizeComboBox->text(0); | 221 | size = sizeComboBox->text(0); |
222 | else { | 222 | else { |
223 | size = sizeComboBox->currentText(); | 223 | size = sizeComboBox->currentText(); |
224 | } | 224 | } |
225 | 225 | ||
226 | // odebug << "Font size is "+size << oendl; | 226 | // odebug << "Font size is "+size << oendl; |
227 | bool ok; | 227 | bool ok; |
228 | int i_size = size.toInt(&ok,10); | 228 | int i_size = size.toInt(&ok,10); |
229 | QStringList charSetList = fdb.charSets(family); | 229 | QStringList charSetList = fdb.charSets(family); |
230 | // QStringList styles = fdb.styles( family ); // string list of styles of our current font family | 230 | // QStringList styles = fdb.styles( family ); // string list of styles of our current font family |
231 | QString charSet; | 231 | QString charSet; |
232 | for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style | 232 | for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style |
233 | charSet = *s; | 233 | charSet = *s; |
234 | // odebug << charSet << oendl; | 234 | // odebug << charSet << oendl; |
235 | } | 235 | } |
236 | selectedFont = fdb.font(family,style,i_size,charSet); | 236 | selectedFont = fdb.font(family,style,i_size,charSet); |
237 | QFontInfo fontInfo( selectedFont); | 237 | QFontInfo fontInfo( selectedFont); |
238 | // if(fontInfo.italic() ) odebug << "italic" << oendl; | 238 | // if(fontInfo.italic() ) odebug << "italic" << oendl; |
239 | selectedFont.setWeight(fontInfo.weight() ); | 239 | selectedFont.setWeight(fontInfo.weight() ); |
240 | // odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl; | 240 | // odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl; |
241 | Config cfg("Gutenbrowser"); | 241 | Config cfg("Gutenbrowser"); |
242 | cfg.setGroup("Font"); | 242 | cfg.setGroup("Font"); |
243 | cfg.writeEntry("Family",family); | 243 | cfg.writeEntry("Family",family); |
244 | cfg.writeEntry("Style",style); | 244 | cfg.writeEntry("Style",style); |
245 | cfg.writeEntry("Size",size); | 245 | cfg.writeEntry("Size",size); |
246 | cfg.writeEntry("CharSet",charSet); | 246 | cfg.writeEntry("CharSet",charSet); |
247 | 247 | ||
248 | if(style.find("Italic",0,TRUE) != -1) { | 248 | if(style.find("Italic",0,TRUE) != -1) { |
249 | selectedFont = fdb.font(family,"Regular",i_size,charSet); | 249 | selectedFont = fdb.font(family,"Regular",i_size,charSet); |
250 | selectedFont.setItalic(TRUE); //ya right | 250 | selectedFont.setItalic(TRUE); //ya right |
251 | cfg.writeEntry("Italic","TRUE"); | 251 | cfg.writeEntry("Italic","TRUE"); |
252 | // odebug << "Style is "+styleListBox->currentText() << oendl; | 252 | // odebug << "Style is "+styleListBox->currentText() << oendl; |
253 | } else | 253 | } else |
254 | cfg.writeEntry("Italic","FALSE"); | 254 | cfg.writeEntry("Italic","FALSE"); |
255 | 255 | ||
256 | MultiLineEdit1->setFont( selectedFont); | 256 | MultiLineEdit1->setFont( selectedFont); |
257 | MultiLineEdit1->update(); | 257 | MultiLineEdit1->update(); |
258 | changedFonts=TRUE; | 258 | changedFonts=TRUE; |
259 | } | 259 | } |
260 | 260 | ||
diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp index e86ca49..ffdc9f0 100644 --- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp +++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp | |||
@@ -1,71 +1,71 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** $Id$ |
3 | ** | 3 | ** |
4 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 4 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. |
5 | ** | 5 | ** |
6 | ** This file is part of an example program for Qt. This example | 6 | ** This file is part of an example program for Qt. This example |
7 | ** program may be used, distributed and modified without limitation. | 7 | ** program may be used, distributed and modified without limitation. |
8 | ** | 8 | ** |
9 | copyright : (C) 2000 -2004 by llornkcor | 9 | copyright : (C) 2000 -2004 by llornkcor |
10 | email : ljp@llornkcor.com | 10 | email : ljp@llornkcor.com |
11 | *****************************************************************************/ | 11 | *****************************************************************************/ |
12 | 12 | ||
13 | #include "helpwindow.h" | 13 | #include "helpwindow.h" |
14 | #include <qstatusbar.h> | 14 | #include <qstatusbar.h> |
15 | 15 | ||
16 | #include <qmenubar.h> | 16 | #include <qmenubar.h> |
17 | #include <qtoolbar.h> | 17 | #include <qtoolbar.h> |
18 | #include <qtoolbutton.h> | 18 | #include <qtoolbutton.h> |
19 | #include <qcombobox.h> | 19 | #include <qcombobox.h> |
20 | 20 | ||
21 | #include <ctype.h> | 21 | #include <ctype.h> |
22 | 22 | ||
23 | HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) | 23 | HelpWindow::HelpWindow( const QString& home_, const QString&, QWidget* parent, const char *name ) |
24 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() | 24 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() |
25 | { | 25 | { |
26 | QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; | 26 | QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; |
27 | // readHistory(); | 27 | // readHistory(); |
28 | // readBookmarks(); | 28 | // readBookmarks(); |
29 | 29 | ||
30 | browser = new QTextBrowser( this ); | 30 | browser = new QTextBrowser( this ); |
31 | QStringList Strlist; | 31 | QStringList Strlist; |
32 | Strlist.append( home_); | 32 | Strlist.append( home_); |
33 | browser->mimeSourceFactory()->setFilePath( Strlist ); | 33 | browser->mimeSourceFactory()->setFilePath( Strlist ); |
34 | 34 | ||
35 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 35 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
36 | 36 | ||
37 | connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged())); | 37 | connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged())); |
38 | 38 | ||
39 | setCentralWidget( browser ); | 39 | setCentralWidget( browser ); |
40 | 40 | ||
41 | if ( !home_.isEmpty() ) | 41 | if ( !home_.isEmpty() ) |
42 | 42 | ||
43 | //////////////////////////////// | 43 | //////////////////////////////// |
44 | browser->setSource( home_ ); | 44 | browser->setSource( home_ ); |
45 | 45 | ||
46 | //////////////////////////////// | 46 | //////////////////////////////// |
47 | connect( browser, SIGNAL( highlighted( const QString&) ), | 47 | connect( browser, SIGNAL( highlighted( const QString&) ), |
48 | statusBar(), SLOT( message( const QString&)) ); | 48 | statusBar(), SLOT( message( const QString&)) ); |
49 | 49 | ||
50 | // resize( 640,600 ); | 50 | // resize( 640,600 ); |
51 | #ifdef Q_WS_QWS | 51 | #ifdef Q_WS_QWS |
52 | setGeometry( 0,0,236,280); | 52 | setGeometry( 0,0,236,280); |
53 | #else | 53 | #else |
54 | setGeometry( 10,30,520,420 ); | 54 | setGeometry( 10,30,520,420 ); |
55 | // resize(520,420); | 55 | // resize(520,420); |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | QPopupMenu* file = new QPopupMenu( this ); | 58 | QPopupMenu* file = new QPopupMenu( this ); |
59 | // file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N ); | 59 | // file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N ); |
60 | file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O ); | 60 | file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O ); |
61 | // file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P ); | 61 | // file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P ); |
62 | file->insertSeparator(); | 62 | file->insertSeparator(); |
63 | file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q ); | 63 | file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q ); |
64 | // file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X ); | 64 | // file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X ); |
65 | 65 | ||
66 | // The same three icons are used twice each. | 66 | // The same three icons are used twice each. |
67 | ////F FIXME | 67 | ////F FIXME |
68 | QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/"; | 68 | QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/"; |
69 | QIconSet icon_back( QPixmap(pixs+"back.png") ); | 69 | QIconSet icon_back( QPixmap(pixs+"back.png") ); |
70 | QIconSet icon_forward( QPixmap(pixs+"forward.png") ); | 70 | QIconSet icon_forward( QPixmap(pixs+"forward.png") ); |
71 | QIconSet icon_home( QPixmap(pixs+"home.png") ); | 71 | QIconSet icon_home( QPixmap(pixs+"home.png") ); |