Log Message:
-----------
Resizing dlg to fit buttons
Modified Files:
--------------
pgadmin3/src/include:
frmStatus.h (r1.17 -> r1.18)
pgadmin3/src/ui:
frmStatus.cpp (r1.44 -> r1.45)
pgadmin3/src/ui/common:
frmStatus.xrc (r1.15 -> r1.16)
xrcDialogs.cpp (r1.45 -> r1.46)
Index: frmStatus.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.17 -r1.18
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -59,7 +59,6 @@
void checkConnection();
frmMain *mainForm;
- wxStatusBar *statusBar;
wxButton *btnCancelSt, *btnTerminateSt,*btnCancelLk, *btnTerminateLk;
wxString logFormat;
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.44 -r1.45
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -83,8 +83,6 @@
RestorePosition(-1, -1, 400, 240, 200, 150);
SetTitle(_title);
SetIcon(wxIcon(pgAdmin3_xpm));
- statusBar = new wxStatusBar(this, -1, wxST_SIZEGRIP);
- wxXmlResource::Get()->AttachUnknownControl(wxT("unkStatusBar"), statusBar);
mainForm=form;
timer=0;
Index: xrcDialogs.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.45 -r1.46
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -7765,7 +7765,7 @@
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_39 = 7708;
+static size_t xml_res_size_39 = 7640;
static unsigned char xml_res_file_39[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -8076,49 +8076,45 @@
60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,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,32,32,32,32,32,32,32,32,60,112,111,115,62,50,56,51,
-44,52,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,60,115,105,122,101,62,53,51,44,45,49,100,60,47,115,105,122,101,62,10,
-32,32,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,32,32,60,102,108,97,103,62,119,120,84,79,80,
-124,119,120,66,79,84,84,79,77,124,119,120,76,69,70,84,124,119,120,82,73,
-71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
-60,98,111,114,100,101,114,62,53,60,47,98,111,114,100,101,114,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,115,
-105,122,101,114,105,116,101,109,34,62,10,32,32,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,66,117,
-116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,67,76,79,83,
-69,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
-108,62,67,108,111,115,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,51,52,50,44,52,100,60,47,112,
-111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,
-101,62,53,51,44,45,49,100,60,47,115,105,122,101,62,10,32,32,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,32,32,60,102,108,97,103,62,119,120,76,69,70,84,124,119,120,82,
-73,71,72,84,124,119,120,65,76,73,71,78,95,67,69,78,84,82,69,95,86,69,82,
-84,73,67,65,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,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,103,114,111,119,97,98,108,101,99,111,108,115,62,
-50,60,47,103,114,111,119,97,98,108,101,99,111,108,115,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,
-102,108,97,103,62,119,120,84,79,80,124,119,120,69,88,80,65,78,68,124,119,
-120,71,82,79,87,60,47,102,108,97,103,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,103,114,111,119,97,98,108,
-101,99,111,108,115,62,48,60,47,103,114,111,119,97,98,108,101,99,111,108,
-115,62,10,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,114,111,119,
-115,62,48,60,47,103,114,111,119,97,98,108,101,114,111,119,115,62,10,32,
-32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,
-105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,60,111,
-98,106,101,99,116,32,99,108,97,115,115,61,34,117,110,107,110,111,119,110,
-34,32,110,97,109,101,61,34,117,110,107,83,116,97,116,117,115,66,97,114,
-34,62,10,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,45,49,44,49,
-53,100,60,47,115,105,122,101,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,102,108,97,103,62,119,120,
-71,82,79,87,60,47,102,108,97,103,62,10,32,32,32,32,32,32,60,47,111,98,106,
-101,99,116,62,10,32,32,32,32,60,47,111,98,106,101,99,116,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};
+44,52,100,60,47,112,111,115,62,10,32,32,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,32,32,60,102,
+108,97,103,62,119,120,84,79,80,124,119,120,66,79,84,84,79,77,124,119,120,
+76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,53,60,47,98,
+111,114,100,101,114,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,115,105,122,101,114,105,116,101,109,34,62,10,
+32,32,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,66,117,116,116,111,110,34,32,110,97,109,101,61,
+34,119,120,73,68,95,67,76,79,83,69,34,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,60,108,97,98,101,108,62,67,108,111,115,101,60,47,108,97,
+98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,51,52,50,44,52,100,60,47,112,111,115,62,10,32,32,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,
+32,32,60,102,108,97,103,62,119,120,76,69,70,84,124,119,120,82,73,71,72,
+84,124,119,120,65,76,73,71,78,95,67,69,78,84,82,69,95,86,69,82,84,73,67,
+65,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,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,103,114,111,119,97,98,108,101,99,111,108,115,62,50,60,47,
+103,114,111,119,97,98,108,101,99,111,108,115,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,102,108,
+97,103,62,119,120,84,79,80,124,119,120,69,88,80,65,78,68,124,119,120,71,
+82,79,87,60,47,102,108,97,103,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,103,114,111,119,97,98,108,101,99,
+111,108,115,62,48,60,47,103,114,111,119,97,98,108,101,99,111,108,115,62,
+10,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,114,111,119,115,62,
+48,60,47,103,114,111,119,97,98,108,101,114,111,119,115,62,10,32,32,32,32,
+32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,
+114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,60,111,98,106,101,
+99,116,32,99,108,97,115,115,61,34,117,110,107,110,111,119,110,34,32,110,
+97,109,101,61,34,117,110,107,83,116,97,116,117,115,66,97,114,34,62,10,32,
+32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,45,49,44,49,53,100,60,
+47,115,105,122,101,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,102,108,97,103,62,119,120,71,82,79,
+87,60,47,102,108,97,103,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,
+116,62,10,32,32,32,32,60,47,111,98,106,101,99,116,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};
void InitXmlResource()
{
Index: frmStatus.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/frmStatus.xrc,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/ui/common/frmStatus.xrc -Lsrc/ui/common/frmStatus.xrc -u -w -r1.15 -r1.16
--- src/ui/common/frmStatus.xrc
+++ src/ui/common/frmStatus.xrc
@@ -167,7 +167,6 @@
<label>Refresh</label>
<default>1</default>
<pos>283,4d</pos>
- <size>53,-1d</size>
</object>
<flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT</flag>
<border>5</border>
@@ -176,7 +175,6 @@
<object class="wxButton" name="wxID_CLOSE">
<label>Close</label>
<pos>342,4d</pos>
- <size>53,-1d</size>
</object>
<flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
<border>3</border>
---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster
