author | zecke <zecke> | 2005-02-19 17:24:39 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-02-19 17:24:39 (UTC) |
commit | b02c537198dad1e53f8c4004a4c08578e431b411 (patch) (unidiff) | |
tree | e68be3ed8bb7d27c1716e7df22dc2ba0f5f3091c | |
parent | be32e0c045814142954ac37c89715313633d6aa2 (diff) | |
download | opie-b02c537198dad1e53f8c4004a4c08578e431b411.zip opie-b02c537198dad1e53f8c4004a4c08578e431b411.tar.gz opie-b02c537198dad1e53f8c4004a4c08578e431b411.tar.bz2 |
-QFileDialog is not used in opentext.cpp so remove it from its header file
-Help Window eventually uses QFileDialog, better include it then as well...
-rw-r--r-- | noncore/apps/opie-gutenbrowser/helpwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/openetext.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp index ffdc9f0..57b1e74 100644 --- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp +++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp | |||
@@ -1,84 +1,88 @@ | |||
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 | #ifndef QT_NO_FILEDIALOG | ||
22 | #include <qfiledialog.h> | ||
23 | #endif | ||
24 | |||
21 | #include <ctype.h> | 25 | #include <ctype.h> |
22 | 26 | ||
23 | HelpWindow::HelpWindow( const QString& home_, const QString&, QWidget* parent, const char *name ) | 27 | HelpWindow::HelpWindow( const QString& home_, const QString&, QWidget* parent, const char *name ) |
24 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() | 28 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() |
25 | { | 29 | { |
26 | QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; | 30 | QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; |
27 | // readHistory(); | 31 | // readHistory(); |
28 | // readBookmarks(); | 32 | // readBookmarks(); |
29 | 33 | ||
30 | browser = new QTextBrowser( this ); | 34 | browser = new QTextBrowser( this ); |
31 | QStringList Strlist; | 35 | QStringList Strlist; |
32 | Strlist.append( home_); | 36 | Strlist.append( home_); |
33 | browser->mimeSourceFactory()->setFilePath( Strlist ); | 37 | browser->mimeSourceFactory()->setFilePath( Strlist ); |
34 | 38 | ||
35 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 39 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
36 | 40 | ||
37 | connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged())); | 41 | connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged())); |
38 | 42 | ||
39 | setCentralWidget( browser ); | 43 | setCentralWidget( browser ); |
40 | 44 | ||
41 | if ( !home_.isEmpty() ) | 45 | if ( !home_.isEmpty() ) |
42 | 46 | ||
43 | //////////////////////////////// | 47 | //////////////////////////////// |
44 | browser->setSource( home_ ); | 48 | browser->setSource( home_ ); |
45 | 49 | ||
46 | //////////////////////////////// | 50 | //////////////////////////////// |
47 | connect( browser, SIGNAL( highlighted( const QString&) ), | 51 | connect( browser, SIGNAL( highlighted( const QString&) ), |
48 | statusBar(), SLOT( message( const QString&)) ); | 52 | statusBar(), SLOT( message( const QString&)) ); |
49 | 53 | ||
50 | // resize( 640,600 ); | 54 | // resize( 640,600 ); |
51 | #ifdef Q_WS_QWS | 55 | #ifdef Q_WS_QWS |
52 | setGeometry( 0,0,236,280); | 56 | setGeometry( 0,0,236,280); |
53 | #else | 57 | #else |
54 | setGeometry( 10,30,520,420 ); | 58 | setGeometry( 10,30,520,420 ); |
55 | // resize(520,420); | 59 | // resize(520,420); |
56 | #endif | 60 | #endif |
57 | 61 | ||
58 | QPopupMenu* file = new QPopupMenu( this ); | 62 | QPopupMenu* file = new QPopupMenu( this ); |
59 | // file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N ); | 63 | // file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N ); |
60 | file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O ); | 64 | file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O ); |
61 | // file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P ); | 65 | // file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P ); |
62 | file->insertSeparator(); | 66 | file->insertSeparator(); |
63 | file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q ); | 67 | file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q ); |
64 | // file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X ); | 68 | // file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X ); |
65 | 69 | ||
66 | // The same three icons are used twice each. | 70 | // The same three icons are used twice each. |
67 | ////F FIXME | 71 | ////F FIXME |
68 | QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/"; | 72 | QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/"; |
69 | QIconSet icon_back( QPixmap(pixs+"back.png") ); | 73 | QIconSet icon_back( QPixmap(pixs+"back.png") ); |
70 | QIconSet icon_forward( QPixmap(pixs+"forward.png") ); | 74 | QIconSet icon_forward( QPixmap(pixs+"forward.png") ); |
71 | QIconSet icon_home( QPixmap(pixs+"home.png") ); | 75 | QIconSet icon_home( QPixmap(pixs+"home.png") ); |
72 | 76 | ||
73 | QPopupMenu* go = new QPopupMenu( this ); | 77 | QPopupMenu* go = new QPopupMenu( this ); |
74 | backwardId = go->insertItem( icon_back, tr("&Backward"), browser, SLOT( backward() ), ALT | Key_Left ); | 78 | backwardId = go->insertItem( icon_back, tr("&Backward"), browser, SLOT( backward() ), ALT | Key_Left ); |
75 | forwardId = go->insertItem( icon_forward, tr("&Forward"), browser, SLOT( forward() ), ALT | Key_Right ); | 79 | forwardId = go->insertItem( icon_forward, tr("&Forward"), browser, SLOT( forward() ), ALT | Key_Right ); |
76 | go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) ); | 80 | go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) ); |
77 | 81 | ||
78 | // QPopupMenu* help = new QPopupMenu( this ); | 82 | // QPopupMenu* help = new QPopupMenu( this ); |
79 | // help->insertItem( tr("&About ..."), this, SLOT( about() ) ); | 83 | // help->insertItem( tr("&About ..."), this, SLOT( about() ) ); |
80 | // help->insertItem( tr("About &Qt ..."), this, SLOT( aboutQt() ) ); | 84 | // help->insertItem( tr("About &Qt ..."), this, SLOT( aboutQt() ) ); |
81 | 85 | ||
82 | 86 | ||
83 | hist = new QPopupMenu( this ); | 87 | hist = new QPopupMenu( this ); |
84 | QStringList::Iterator it = history.begin(); | 88 | QStringList::Iterator it = history.begin(); |
diff --git a/noncore/apps/opie-gutenbrowser/openetext.h b/noncore/apps/opie-gutenbrowser/openetext.h index 6db71c4..ecc0bbd 100644 --- a/noncore/apps/opie-gutenbrowser/openetext.h +++ b/noncore/apps/opie-gutenbrowser/openetext.h | |||
@@ -1,82 +1,79 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | openetext.h - description | 2 | openetext.h - description |
3 | ------------------- | 3 | ------------------- |
4 | begin : Tue Jul 25 2000 | 4 | begin : Tue Jul 25 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 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef OPENETEXT_H | 17 | #ifndef OPENETEXT_H |
18 | #define OPENETEXT_H | 18 | #define OPENETEXT_H |
19 | #include "gutenbrowser.h" | 19 | #include "gutenbrowser.h" |
20 | #include <qdialog.h> | 20 | #include <qdialog.h> |
21 | #include <qstringlist.h> | 21 | #include <qstringlist.h> |
22 | #ifndef Q_WS_QWS | ||
23 | #include <qfiledialog.h> | ||
24 | #endif | ||
25 | //#include <fileselector.h> | 22 | //#include <fileselector.h> |
26 | #include <qlabel.h> | 23 | #include <qlabel.h> |
27 | #include <qlistbox.h> | 24 | #include <qlistbox.h> |
28 | #include <qpushbutton.h> | 25 | #include <qpushbutton.h> |
29 | #include <qstrlist.h> | 26 | #include <qstrlist.h> |
30 | #include <qwidget.h> | 27 | #include <qwidget.h> |
31 | //#include "CConfigFile.h" | 28 | //#include "CConfigFile.h" |
32 | 29 | ||
33 | /** | 30 | /** |
34 | *@author llornkcor | 31 | *@author llornkcor |
35 | */ | 32 | */ |
36 | 33 | ||
37 | class OpenEtext : public QDialog { | 34 | class OpenEtext : public QDialog { |
38 | Q_OBJECT | 35 | Q_OBJECT |
39 | public: | 36 | public: |
40 | OpenEtext(QWidget *parent, QString name); | 37 | OpenEtext(QWidget *parent, QString name); |
41 | ~OpenEtext(); | 38 | ~OpenEtext(); |
42 | 39 | ||
43 | QPushButton* RemoveButton, * OpenFileButton, * OpenButton, *scanButton, *editButton; | 40 | QPushButton* RemoveButton, * OpenFileButton, * OpenButton, *scanButton, *editButton; |
44 | void getTitles(); | 41 | void getTitles(); |
45 | QString title; | 42 | QString title; |
46 | QString file; | 43 | QString file; |
47 | QString selFile; | 44 | QString selFile; |
48 | QString s_numofFiles; | 45 | QString s_numofFiles; |
49 | QString fileName; | 46 | QString fileName; |
50 | QString name; | 47 | QString name; |
51 | QString openFileTitle; | 48 | QString openFileTitle; |
52 | QStringList fileList; | 49 | QStringList fileList; |
53 | QString local_library; | 50 | QString local_library; |
54 | QString local_index; | 51 | QString local_index; |
55 | QString title_text; | 52 | QString title_text; |
56 | void remFile(); | 53 | void remFile(); |
57 | void removeSelection(); | 54 | void removeSelection(); |
58 | QString titleFromLibrary( const QString fileName); | 55 | QString titleFromLibrary( const QString fileName); |
59 | bool FindTitle( const QString filename); | 56 | bool FindTitle( const QString filename); |
60 | bool checkConf(); | 57 | bool checkConf(); |
61 | // CConfigFile *config; | 58 | // CConfigFile *config; |
62 | 59 | ||
63 | protected: | 60 | protected: |
64 | 61 | ||
65 | void initDialog(); | 62 | void initDialog(); |
66 | QListBox *QListBox_1; | 63 | QListBox *QListBox_1; |
67 | QPushButton *QPushButton_OK; | 64 | QPushButton *QPushButton_OK; |
68 | QPushButton *QPushButton_Cancel; | 65 | QPushButton *QPushButton_Cancel; |
69 | QLabel *QLabel_1; | 66 | QLabel *QLabel_1; |
70 | 67 | ||
71 | private: | 68 | private: |
72 | private slots: | 69 | private slots: |
73 | 70 | ||
74 | virtual void select_title(int index ); | 71 | virtual void select_title(int index ); |
75 | virtual void remove(); | 72 | virtual void remove(); |
76 | virtual void scan(); | 73 | virtual void scan(); |
77 | virtual void open(); | 74 | virtual void open(); |
78 | virtual void OpenTitle(); | 75 | virtual void OpenTitle(); |
79 | virtual void editTitle(); | 76 | virtual void editTitle(); |
80 | }; | 77 | }; |
81 | 78 | ||
82 | #endif | 79 | #endif |