summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp30
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.h2
-rw-r--r--noncore/apps/opie-gutenbrowser/SearchDialog.cpp2
3 files changed, 17 insertions, 17 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
@@ -59,13 +59,13 @@ NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WF
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,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 ) {
70// if ( !name ) 70// if ( !name )
71// setName( "HTTP NetworkDialog" ); 71// setName( "HTTP NetworkDialog" );
@@ -96,42 +96,42 @@ void NetworkDialog::initDialog() {
96 hbox->setMargin(4); 96 hbox->setMargin(4);
97 97
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
136// if(timerProgess < 19 && posTimer) { 136// if(timerProgess < 19 && posTimer) {
137// ProgressBar1->setProgress(timerProgess); 137// ProgressBar1->setProgress(timerProgess);
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
@@ -51,13 +51,13 @@ 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;
62 int i, totalBytesDownloaded; 62 int i, totalBytesDownloaded;
63 bool autoOk; 63 bool autoOk;
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
@@ -27,13 +27,13 @@ SearchDialog::SearchDialog( QWidget* parent, const char* name, bool modal, WFla
27 Config cfg("Gutenbrowser"); 27 Config cfg("Gutenbrowser");
28 cfg.setGroup("General"); 28 cfg.setGroup("General");
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
39 QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; 39 QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";