summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-15 21:29:57 (UTC)
committer harlekin <harlekin>2002-06-15 21:29:57 (UTC)
commit8ab6f33e6bd35266bed38952f149a328bea3c544 (patch) (unidiff)
treeaee29787d61e58c6a8b345de40acaf36d0fdc424
parente7712c9535a461c6f5f98e78b856af0bb9eca0c6 (diff)
downloadopie-8ab6f33e6bd35266bed38952f149a328bea3c544.zip
opie-8ab6f33e6bd35266bed38952f149a328bea3c544.tar.gz
opie-8ab6f33e6bd35266bed38952f149a328bea3c544.tar.bz2
update
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp5
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index b0ffbb3..63c5472 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -51,18 +51,15 @@ namespace OpieTooth {
51 Frame7->setFrameShape( QFrame::StyledPanel ); 51 Frame7->setFrameShape( QFrame::StyledPanel );
52 Frame7->setFrameShadow( QFrame::Raised ); 52 Frame7->setFrameShadow( QFrame::Raised );
53 53
54
55 QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" ); 54 QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" );
56 privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) ); 55 privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) );
57 Layout11 = new QVBoxLayout( privateLayoutWidget ); 56 Layout11 = new QVBoxLayout( privateLayoutWidget );
58 Layout11->setSpacing( 6 ); 57 Layout11->setSpacing( 6 );
59 Layout11->setMargin( 0 ); 58 Layout11->setMargin( 0 );
60 59
61
62 progress = new QProgressBar(privateLayoutWidget, "progbar"); 60 progress = new QProgressBar(privateLayoutWidget, "progbar");
63 progress->setTotalSteps(20); 61 progress->setTotalSteps(20);
64 62
65
66 QFrame *buttonFrame = new QFrame(Frame7, ""); 63 QFrame *buttonFrame = new QFrame(Frame7, "");
67 64
68 StartButton = new QPushButton( buttonFrame, "StartButton" ); 65 StartButton = new QPushButton( buttonFrame, "StartButton" );
@@ -71,7 +68,6 @@ namespace OpieTooth {
71 StopButton = new QPushButton( buttonFrame, "StopButton" ); 68 StopButton = new QPushButton( buttonFrame, "StopButton" );
72 StopButton->setText( tr( "Cancel" ) ); 69 StopButton->setText( tr( "Cancel" ) );
73 70
74
75 QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); 71 QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame);
76 buttonLayout->addWidget(StartButton); 72 buttonLayout->addWidget(StartButton);
77 buttonLayout->addWidget(StopButton); 73 buttonLayout->addWidget(StopButton);
@@ -102,6 +98,7 @@ namespace OpieTooth {
102 if (progressStat++ < 20) { 98 if (progressStat++ < 20) {
103 QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); 99 QTimer::singleShot( 1000, this, SLOT(progressTimer() ) );
104 } 100 }
101 progress->setProgress(progressStat++);
105 102
106 } 103 }
107 104
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index 22ee01d..fcaee6e 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -60,10 +60,10 @@ class Device;
60 private slots: 60 private slots:
61 void stopSearch(); 61 void stopSearch();
62 void startSearch(); 62 void startSearch();
63 void progressTimer();
63 void fillList(const QString& device, RemoteDevices::ValueList list); 64 void fillList(const QString& device, RemoteDevices::ValueList list);
64 65
65 private: 66 private:
66 void progressTimer(int maxSeconds);
67 Manager *localDevice; 67 Manager *localDevice;
68 int progressStat; 68 int progressStat;
69 }; 69 };