SVN Commit by andreas: r4796 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ui
| От | svn@pgadmin.org |
|---|---|
| Тема | SVN Commit by andreas: r4796 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ui |
| Дата | |
| Msg-id | 200512061329.jB6DTRPu028182@developer.pgadmin.org обсуждение исходный текст |
| Список | pgadmin-hackers |
Author: andreas
Date: 2005-12-06 13:29:26 +0000 (Tue, 06 Dec 2005)
New Revision: 4796
Modified:
branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgServer.xrc
branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp
Log:
fix dlgServer layout
Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgServer.xrc
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgServer.xrc 2005-12-06 13:09:22 UTC (rev 4795)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgServer.xrc 2005-12-06 13:29:26 UTC (rev 4796)
@@ -10,242 +10,292 @@
+
<label>Address</label>
+
<pos>5,7d</pos>
</object>
<object class="wxTextCtrl" name="txtName">
+
<pos>70,5d</pos>
+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stDescription">
+
<label>Description</label>
+
<pos>5,22d</pos>
</object>
<object class="wxTextCtrl" name="txtDescription">
+
<pos>70,20d</pos>
+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stService">
+
<label>Service</label>
+
<pos>5,37d</pos>
</object>
<object class="wxTextCtrl" name="txtService">
+
<pos>70,35d</pos>
+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stPort">
+
<label>Port</label>
+
<pos>5,52d</pos>
</object>
<object class="wxTextCtrl" name="txtPort">
+
<pos>70,50d</pos>
+
<size>28,-1d</size>
</object>
<object class="wxStaticText" name="stSSL">
+
<label>SSL</label>
+
<pos>105,52d</pos>
</object>
<object class="wxComboBox" name="cbSSL">
+
<pos>120,50d</pos>
+
<size>85,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
+
<content/>
</object>
<object class="wxStaticText" name="stDatabase">
+
<label>Maintenance DB</label>
+
<pos>5,67d</pos>
</object>
<object class="wxComboBox" name="cbDatabase">
+
<pos>70,65d</pos>
+
<size>135,12d</size>
+
<content/>
+
<style>wxCB_DROPDOWN</style>
</object>
<object class="wxStaticText" name="stUsername">
+
<label>Username</label>
+
<pos>5,82d</pos>
</object>
<object class="wxTextCtrl" name="txtUsername">
+
<pos>70,80d</pos>
+
<size>135,-1d</size>
</object>
- <object class="wxStaticText" name="stTryConnect">
+ <object class="wxStaticText" name="stPassword">
- <label>Connect now</label>
+ <label>Password</label>
- <pos>5,97d</pos>
+
+
+ <pos>5,98d</pos>
</object>
- <object class="wxCheckBox" name="chkTryConnect">
+ <object class="wxTextCtrl" name="txtPassword">
- <label></label>
+ <pos>70,95d</pos>
- <checked>1</checked>
+ <style>wxTE_PASSWORD</style>
- <pos>70,95d</pos>
- <size>12,12d</size>
+ <size>135,-1d</size>
</object>
<object class="wxStaticText" name="stStorePwd">
+
<label>store password</label>
+
<pos>5,112d</pos>
</object>
<object class="wxCheckBox" name="chkStorePwd">
+
<label></label>
+
<checked>1</checked>
+
<pos>70,110d</pos>
+
<size>12,12d</size>
</object>
- <object class="wxStaticText" name="stPassword">
+ <object class="wxStaticText" name="stTryConnect">
- <label>Password</label>
+ <label>Connect now</label>
- <pos>5,128d</pos>
+
+
+ <pos>5,127d</pos>
</object>
- <object class="wxTextCtrl" name="txtPassword">
+ <object class="wxCheckBox" name="chkTryConnect">
- <pos>70,125d</pos>
+ <label></label>
- <style>wxTE_PASSWORD</style>
+ <checked>1</checked>
- <size>135,-1d</size>
+
+
+
+ <pos>70,125d</pos>
+
+
+
+
+ <size>12,12d</size>
</object>
</object>
+
<selected>1</selected>
</object>
<pos>2,2d</pos>
@@ -255,37 +305,44 @@
+
<label>Help</label>
+
<pos>2,165d</pos>
</object>
<object class="wxButton" name="wxID_OK">
+
<label>OK</label>
+
<default>1</default>
+
<pos>113,165d</pos>
</object>
<object class="wxButton" name="wxID_CANCEL">
+
<label>Cancel</label>
+
<pos>166,165d</pos>
</object>
<size>218,183d</size>
<style></style>
</object>
-</resource>
+</resource>
\ No newline at end of file
Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp 2005-12-06 13:09:22 UTC (rev 4795)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp 2005-12-06 13:29:26 UTC (rev 4796)
@@ -8,6 +8,9 @@
#pragma hdrstop
#endif
+#ifndef WX_PRECOMP
+ #include <wx/wx.h>
+#endif
#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
@@ -7013,10 +7016,41 @@
115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,
99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,
99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,
-32,110,97,109,101,61,34,115,116,84,114,121,67,111,110,110,101,99,116,34,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,67,111,
-110,110,101,99,116,32,110,111,119,60,47,108,97,98,101,108,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,57,55,100,60,47,112,
+32,110,97,109,101,61,34,115,116,80,97,115,115,119,111,114,100,34,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,80,97,115,115,
+119,111,114,100,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,112,111,115,62,53,44,57,56,100,60,47,112,111,115,62,10,32,32,
+32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,
+32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
+120,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,
+80,97,115,115,119,111,114,100,34,62,10,32,32,32,32,32,32,32,32,32,32,32,
+32,60,112,111,115,62,55,48,44,57,53,100,60,47,112,111,115,62,10,32,32,32,
+32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,84,69,95,80,
+65,83,83,87,79,82,68,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,
+105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
+116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,
+108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,
+110,97,109,101,61,34,115,116,83,116,111,114,101,80,119,100,34,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,115,116,111,114,
+101,32,112,97,115,115,119,111,114,100,60,47,108,97,98,101,108,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,49,50,100,60,
+47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,
+99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,
+99,108,97,115,115,61,34,119,120,67,104,101,99,107,66,111,120,34,32,110,
+97,109,101,61,34,99,104,107,83,116,111,114,101,80,119,100,34,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,47,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,99,104,101,99,107,101,100,62,49,60,47,99,104,
+101,99,107,101,100,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
+115,62,55,48,44,49,49,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,115,105,122,101,62,49,50,44,49,50,100,60,47,115,105,
+122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
+97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,
+97,109,101,61,34,115,116,84,114,121,67,111,110,110,101,99,116,34,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,67,111,110,
+110,101,99,116,32,110,111,119,60,47,108,97,98,101,108,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,50,55,100,60,47,112,
111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
97,115,115,61,34,119,120,67,104,101,99,107,66,111,120,34,32,110,97,109,
@@ -7024,66 +7058,35 @@
32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,47,62,10,32,32,32,32,
32,32,32,32,32,32,32,32,60,99,104,101,99,107,101,100,62,49,60,47,99,104,
101,99,107,101,100,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
-115,62,55,48,44,57,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,115,105,122,101,62,49,50,44,49,50,100,60,47,115,105,122,
-101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
-10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,
-115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,
-109,101,61,34,115,116,83,116,111,114,101,80,119,100,34,62,10,32,32,32,32,
-32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,115,116,111,114,101,32,
-112,97,115,115,119,111,114,100,60,47,108,97,98,101,108,62,10,32,32,32,32,
-32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,49,50,100,60,47,112,
-111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
-62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
-97,115,115,61,34,119,120,67,104,101,99,107,66,111,120,34,32,110,97,109,
-101,61,34,99,104,107,83,116,111,114,101,80,119,100,34,62,10,32,32,32,32,
-32,32,32,32,32,32,32,32,60,108,97,98,101,108,47,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,99,104,101,99,107,101,100,62,49,60,47,99,104,101,99,
-107,101,100,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,
-55,48,44,49,49,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,115,105,122,101,62,49,50,44,49,50,100,60,47,115,105,122,101,
-62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,
-32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
-61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,
-61,34,115,116,80,97,115,115,119,111,114,100,34,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,108,97,98,101,108,62,80,97,115,115,119,111,114,100,
-60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,
-111,115,62,53,44,49,50,56,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
-32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,
-32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,84,101,120,
-116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,80,97,115,115,
-119,111,114,100,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
115,62,55,48,44,49,50,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,84,69,95,80,65,83,83,
-87,79,82,68,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,105,122,
-101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
-10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
-32,32,32,32,60,115,101,108,101,99,116,101,100,62,49,60,47,115,101,108,101,
-99,116,101,100,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,
-32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,60,47,112,111,115,62,10,
-32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,44,49,54,48,100,60,47,
-115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,
-32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,
-117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,72,69,76,
-80,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,72,101,108,112,60,
-47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,49,
-54,53,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,
-62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
+32,32,32,32,32,32,60,115,105,122,101,62,49,50,44,49,50,100,60,47,115,105,
+122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,
+32,32,32,32,32,60,115,101,108,101,99,116,101,100,62,49,60,47,115,101,108,
+101,99,116,101,100,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,60,47,112,111,115,
+62,10,32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,44,49,54,48,100,
+60,47,115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,
+10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,
-79,75,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,79,75,60,47,108,
-97,98,101,108,62,10,32,32,32,32,32,32,60,100,101,102,97,117,108,116,62,
-49,60,47,100,101,102,97,117,108,116,62,10,32,32,32,32,32,32,60,112,111,
-115,62,49,49,51,44,49,54,53,100,60,47,112,111,115,62,10,32,32,32,32,60,
-47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,
-99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,
-101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,32,32,32,32,32,32,
-60,108,97,98,101,108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,62,
-10,32,32,32,32,32,32,60,112,111,115,62,49,54,54,44,49,54,53,100,60,47,112,
-111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
-60,115,105,122,101,62,50,49,56,44,49,56,51,100,60,47,115,105,122,101,62,
-10,32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,
-99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
+72,69,76,80,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,72,101,108,
+112,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,50,
+44,49,54,53,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,
+99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
+61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,
+73,68,95,79,75,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,79,75,
+60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,100,101,102,97,117,108,
+116,62,49,60,47,100,101,102,97,117,108,116,62,10,32,32,32,32,32,32,60,112,
+111,115,62,49,49,51,44,49,54,53,100,60,47,112,111,115,62,10,32,32,32,32,
+60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,
+32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,
+109,101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,32,32,32,32,32,
+32,60,108,97,98,101,108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,
+62,10,32,32,32,32,32,32,60,112,111,115,62,49,54,54,44,49,54,53,100,60,47,
+112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,
+32,60,115,105,122,101,62,50,49,56,44,49,56,51,100,60,47,115,105,122,101,
+62,10,32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,
+101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
static size_t xml_res_size_37 = 5447;
static unsigned char xml_res_file_37[] = {
В списке pgadmin-hackers по дате отправления:
Предыдущее
От: svn@pgadmin.orgДата:
Сообщение: SVN Commit by andreas: r4795 - in branches/REL-1_4_0_PATCHES/pgadmin3/src: base include/base schema