Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui

1 files changed, 7 insertions, 3 deletions

diff --git a/client/Dialog.h b/client/Dialog.h
index 1b66b55..7155673 100644
--- a/client/Dialog.h
+++ b/client/Dialog.h
@@ -5,9 +5,10 @@
 #include <QDialog>
 #include <vector>
 
+class QButtonGroup;
 class QComboBox;
+class QGridLayout;
 class QLabel;
-class QVBoxLayout;
 class ProxyEntryGeneric;
 class ProxyEntryStatic;
 
@@ -24,11 +25,14 @@ private slots:
 	void CityActivated(int index);
 	
 private:
-	QLabel *topLabel;
-	QLabel *bottomLabel;
+	QButtonGroup *genericProxyGroup;
+	QButtonGroup *staticProxyGroup;
 	QComboBox *countryBox;
 	QComboBox *stateBox;
 	QComboBox *cityBox;
+	QGridLayout *topPanelLayout;
+	QLabel *topLabel;
+	QLabel *bottomLabel;
 };
 
 #endif
\ No newline at end of file