summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-06-15 10:18:36 (UTC)
committer llornkcor <llornkcor>2004-06-15 10:18:36 (UTC)
commitc711eea6fb1fa136cd62dc8b7134ee72968c8a53 (patch) (unidiff)
tree5f467c8abff45e468c4b119122553c1eef7f3beb
parent83b4b2d2670b63a2a540006cea2ea8808100d308 (diff)
downloadopie-c711eea6fb1fa136cd62dc8b7134ee72968c8a53.zip
opie-c711eea6fb1fa136cd62dc8b7134ee72968c8a53.tar.gz
opie-c711eea6fb1fa136cd62dc8b7134ee72968c8a53.tar.bz2
start download, fix dialogs
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp30
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.h14
-rw-r--r--noncore/apps/opie-gutenbrowser/SearchDialog.cpp8
3 files changed, 26 insertions, 26 deletions
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index 6e6b707..d629449 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -61,9 +61,9 @@ NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WF
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,110); 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 ) {
@@ -98,38 +98,38 @@ void NetworkDialog::initDialog() {
98 ProgressBar1 = new QProgressBar( Layout1, "ProgressBar1" ); 98 ProgressBar1 = new QProgressBar( Layout1, "ProgressBar1" );
99 ProgressBar1->setProgress(0); 99 ProgressBar1->setProgress(0);
100 hbox->addWidget(ProgressBar1,10,AlignCenter); 100 hbox->addWidget(ProgressBar1,10,AlignCenter);
101 101
102 hbox->addStretch(1); 102 // hbox->addStretch(1);
103 buttonOk = new QPushButton( Layout1, "buttonOk" ); 103// buttonOk = new QPushButton( Layout1, "buttonOk" );
104 buttonOk->setText( tr( "&OK" ) ); 104// buttonOk->setText( tr( "&OK" ) );
105 hbox->addWidget(buttonOk,0,AlignRight); 105// hbox->addWidget(buttonOk,0,AlignRight);
106 hbox->addSpacing(5); 106// hbox->addSpacing(5);
107 buttonCancel = new QPushButton( Layout1, "buttonCancel" ); 107 buttonCancel = new QPushButton( Layout1, "buttonCancel" );
108 buttonCancel->setText( tr( "&Cancel" ) ); 108 buttonCancel->setText( tr( "&Cancel" ) );
109 buttonCancel->setAutoDefault( TRUE ); 109 buttonCancel->setAutoDefault( TRUE );
110 buttonCancel->setDefault( TRUE ); 110 buttonCancel->setDefault( TRUE );
111 hbox->addWidget(buttonCancel,0,AlignRight); 111 hbox->addWidget(buttonCancel,0,AlignRight);
112 112
113 ProgressBar1->setFixedSize(140,22); 113 ProgressBar1->setFixedSize(150,25);
114 buttonOk->setFixedSize(35,22); 114// buttonOk->setFixedSize(35,22);
115 buttonCancel->setFixedSize(35,22); 115 buttonCancel->setFixedSize(50,25);
116 warnLabel ->setGeometry( QRect( 5,1,230,25)); 116 warnLabel ->setGeometry( QRect( 5,1,230,25));
117 TextLabel3->setGeometry( QRect( 5,20,230,25)); 117 TextLabel3->setGeometry( QRect( 5,20,230,25));
118 Layout1->setGeometry( QRect(1,60,235,50)); //TODO check these!! 118 Layout1->setGeometry( QRect(1,60,235,50)); //TODO check these!!
119 119
120// timer= new QTimer(this,"vu timer"); 120// timer= new QTimer(this,"vu timer");
121// connectionTimer=new QTimer(this,"connectionTimeout"); 121// connectionTimer=new QTimer(this,"connectionTimeout");
122 122
123 connect(buttonOk,SIGNAL(clicked()),this,SLOT(doOk())); 123// connect(buttonOk,SIGNAL(clicked()),this,SLOT(doOk()));
124 connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject())); 124 connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject()));
125// connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot())); 125// connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot()));
126// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot())); 126// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
127 if(autoOk) { 127// if(autoOk) {
128 owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl; 128// buttonOk->setDown(true);
129 buttonOk->setDown(true); 129 QTimer::singleShot( 1000, this, SLOT( doOk() ));
130 doOk(); 130// }
131 } 131
132} 132}
133 133
134void NetworkDialog::timeSlot() { 134void NetworkDialog::timeSlot() {
135 135
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.h b/noncore/apps/opie-gutenbrowser/NetworkDialog.h
index 447979f..61595a8 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.h
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.h
@@ -29,21 +29,21 @@
29 29
30//class QProgressBar; 30//class QProgressBar;
31 31
32class NetworkDialog : public QDialog 32class NetworkDialog : public QDialog
33{ 33{
34 Q_OBJECT 34 Q_OBJECT
35 35
36public: 36public:
37 NetworkDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QStringList netList=0); 37 NetworkDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QStringList netList=0);
38/* NetworkDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString & UrlStr = 0, const QString & dirStr=0,const QString & fileStr=0, const QString & psrtialFile=0); */ 38/* NetworkDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString & UrlStr = 0, const QString & dirStr=0,const QString & fileStr=0, const QString & psrtialFile=0); */
39 ~NetworkDialog(); 39 ~NetworkDialog();
40 40
41 QFile fiole; 41 QFile fiole;
42 QTimer * connectionTimer; 42 QTimer * connectionTimer;
43 QTimer * timer; 43 QTimer * timer;
44 int timerProgess; 44 int timerProgess;
45 bool posTimer; 45 bool posTimer;
46 QString s_partialFileName, s_finally; 46 QString s_partialFileName, s_finally;
47 bool foundIt, successDownload; 47 bool foundIt, successDownload;
48 QLabel * warnLabel; 48 QLabel * warnLabel;
49 QLabel* TextLabel3; 49 QLabel* TextLabel3;
@@ -51,11 +51,11 @@ public:
51 bool ok; 51 bool ok;
52 QString local_library; 52 QString local_library;
53 QString ftp_host; 53 QString ftp_host;
54 QString ftp_base_dir; 54 QString ftp_base_dir;
55 QString dir, strUrl, networkUrl; 55 QString dir, strUrl, networkUrl;
56 56
57 QPushButton* buttonOk; 57// QPushButton* buttonOk;
58 QPushButton* buttonCancel; 58 QPushButton* buttonCancel;
59 59
60 QString localFileName; 60 QString localFileName;
61 bool fileFound; 61 bool fileFound;
@@ -71,9 +71,9 @@ private slots:
71 bool downloadFile( QString strUrl); 71 bool downloadFile( QString strUrl);
72 void connectionTimeSlot(); 72 void connectionTimeSlot();
73 void timeSlot(); 73 void timeSlot();
74 void doOk(); 74 void doOk();
75 75
76 private: 76 private:
77/* #ifndef Q_WS_QWS */ 77/* #ifndef Q_WS_QWS */
78 78
79/* QString getOpenFileName(); */ 79/* QString getOpenFileName(); */
diff --git a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
index d989304..055ffee 100644
--- a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
@@ -29,10 +29,10 @@ SearchDialog::SearchDialog( QWidget* parent, const char* name, bool modal, WFla
29 QString lastSearch=cfg.readEntry("LastSearch",""); 29 QString lastSearch=cfg.readEntry("LastSearch","");
30 30
31#warning FIXME 31#warning FIXME
32 // FIXME 32 // FIXME
33 resize( 220,100); 33 resize( 220,110);
34 34
35 QGridLayout *layout = new QGridLayout( this ); 35 QGridLayout *layout = new QGridLayout( this );
36 layout->setSpacing( 2); 36 layout->setSpacing( 2);
37 layout->setMargin( 2); 37 layout->setMargin( 2);
38 38
@@ -97,9 +97,9 @@ bool SearchDialog::forward_search() {
97void SearchDialog::byeBye() 97void SearchDialog::byeBye()
98{ 98{
99 99
100 searchString = get_text(); 100 searchString = get_text();
101// odebug << "Search string is "+searchString << oendl; 101// odebug << "Search string is "+searchString << oendl;
102 Config cfg("Gutenbrowser"); 102 Config cfg("Gutenbrowser");
103 cfg.setGroup("General"); 103 cfg.setGroup("General");
104 cfg.writeEntry("LastSearch",searchString); 104 cfg.writeEntry("LastSearch",searchString);
105 105
@@ -118,9 +118,9 @@ void SearchDialog::byeBye()
118 118
119void SearchDialog::closed() 119void SearchDialog::closed()
120{ 120{
121 searchString = get_text(); 121 searchString = get_text();
122// odebug << "Search string is "+searchString << oendl; 122// odebug << "Search string is "+searchString << oendl;
123 Config cfg("Gutenbrowser"); 123 Config cfg("Gutenbrowser");
124 cfg.setGroup("General"); 124 cfg.setGroup("General");
125 cfg.writeEntry("LastSearch",searchString); 125 cfg.writeEntry("LastSearch",searchString);
126 126