author | harlekin <harlekin> | 2002-06-15 21:29:57 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-15 21:29:57 (UTC) |
commit | 8ab6f33e6bd35266bed38952f149a328bea3c544 (patch) (unidiff) | |
tree | aee29787d61e58c6a8b345de40acaf36d0fdc424 /noncore | |
parent | e7712c9535a461c6f5f98e78b856af0bb9eca0c6 (diff) | |
download | opie-8ab6f33e6bd35266bed38952f149a328bea3c544.zip opie-8ab6f33e6bd35266bed38952f149a328bea3c544.tar.gz opie-8ab6f33e6bd35266bed38952f149a328bea3c544.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 2 |
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 | |||
@@ -46,37 +46,33 @@ namespace OpieTooth { | |||
46 | resize( 240, 320 ); | 46 | resize( 240, 320 ); |
47 | setCaption( tr( "Scan for devices" ) ); | 47 | setCaption( tr( "Scan for devices" ) ); |
48 | 48 | ||
49 | Frame7 = new QFrame( this, "Frame7" ); | 49 | Frame7 = new QFrame( this, "Frame7" ); |
50 | Frame7->setGeometry( QRect( 0, 0, 240, 331 ) ); | 50 | Frame7->setGeometry( QRect( 0, 0, 240, 331 ) ); |
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" ); |
69 | StartButton->setText( tr( "Start" ) ); | 66 | StartButton->setText( tr( "Start" ) ); |
70 | 67 | ||
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); |
78 | 74 | ||
79 | ListView1 = new QListView( privateLayoutWidget, "ListView1" ); | 75 | ListView1 = new QListView( privateLayoutWidget, "ListView1" ); |
80 | 76 | ||
81 | ListView1->addColumn( tr( "Add" ) ); | 77 | ListView1->addColumn( tr( "Add" ) ); |
82 | ListView1->addColumn( tr( "Device Name" ) ); | 78 | ListView1->addColumn( tr( "Device Name" ) ); |
@@ -97,16 +93,17 @@ namespace OpieTooth { | |||
97 | 93 | ||
98 | // hack, make cleaner later | 94 | // hack, make cleaner later |
99 | void ScanDialog::progressTimer() { | 95 | void ScanDialog::progressTimer() { |
100 | 96 | ||
101 | progressStat++; | 97 | progressStat++; |
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 | ||
108 | void ScanDialog::startSearch() { | 105 | void ScanDialog::startSearch() { |
109 | progress->setProgress(0); | 106 | progress->setProgress(0); |
110 | progressStat = 0; | 107 | progressStat = 0; |
111 | 108 | ||
112 | progressTimer(); | 109 | progressTimer(); |
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 | |||
@@ -55,19 +55,19 @@ class Device; | |||
55 | 55 | ||
56 | 56 | ||
57 | protected: | 57 | protected: |
58 | QVBoxLayout* Layout11; | 58 | QVBoxLayout* Layout11; |
59 | 59 | ||
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 | }; |
70 | 70 | ||
71 | } | 71 | } |
72 | 72 | ||
73 | #endif // SCANDIALOG_H | 73 | #endif // SCANDIALOG_H |