SVN Commit by dpage: r4519 - trunk/pgadmin3/src/ui - Mailing list pgadmin-hackers
From | svn@pgadmin.org |
---|---|
Subject | SVN Commit by dpage: r4519 - trunk/pgadmin3/src/ui |
Date | |
Msg-id | 200510071032.j97AWOs5018829@developer.pgadmin.org Whole thread Raw |
List | pgadmin-hackers |
Author: dpage Date: 2005-10-07 11:32:24 +0100 (Fri, 07 Oct 2005) New Revision: 4519 Removed: trunk/pgadmin3/src/ui/frmQBJoin.xrc Modified: trunk/pgadmin3/src/ui/xrcDialogs.cpp Log: Remove long-redundant xrc file. Deleted: trunk/pgadmin3/src/ui/frmQBJoin.xrc =================================================================== --- trunk/pgadmin3/src/ui/frmQBJoin.xrc 2005-10-07 09:52:43 UTC (rev 4518) +++ trunk/pgadmin3/src/ui/frmQBJoin.xrc 2005-10-07 10:32:24 UTC (rev 4519) @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resource> - <object class="wxDialog" name="frmQBJoin"> - <title>Join</title> - <centered>1</centered> - <size>300, 405</size> - <style>wxSTAY_ON_TOP|wxDIALOG_MODAL|wxCAPTION|wxSYSTEM_MENU</style> - <object class="wxStaticText" name="lblLeft"> - <label>Left Table Columns</label> - <pos>10, 10</pos> - </object> - <object class="wxStaticText" name="lblJoinType"> - <label>Join Type</label> - <pos>10, 100</pos> - </object> - <object class="wxStaticText" name="lblOperator"> - <label>Operator</label> - <pos>185, 100</pos> - </object> - <object class="wxStaticText" name="lblRight"> - <label>Right Table Columns</label> - <pos>10,130</pos> - </object> - <object class="wxButton" name="wxID_CANCEL"> - <label>&Cancel</label> - <default>0</default> - <pos>214, 370</pos> - <size>75, 25</size> - </object> - <object class="wxButton" name="wxID_OK"> - <label>&OK</label> - <default>1</default> - <pos>135, 370</pos> - <size>75, 25</size> - <style></style> - <enabled>0</enabled> - </object> - <object class="wxChoice" name="choiceJoinType"> - <pos>60,97</pos> - <size>100,23</size> - <selection>0</selection> - <pos></pos> - <size></size> - <content> - <item>INNER JOIN</item> - <item>LEFT JOIN</item> - <item>RIGHT JOIN</item> - <item>FULL JOIN</item> - <item>CROSS JOIN</item> - </content> - </object> - <object class="wxListBox" name="listLeft"> - <pos>10,25</pos> - <size>280,60</size> - <pos></pos> - <size></size> - <style>wxLB_SINGLE|wxLB_NEEDED_SB</style> - <content/> - </object> - <object class="wxListBox" name="listRight"> - <pos>10,145</pos> - <size>280,60</size> - <style>wxLB_SINGLE|wxLB_NEEDED_SB</style> - <content/> - </object> - <object class="wxStaticText" name="lblMCJ"> - <label>Multiple Column Joins</label> - <pos>185, 220</pos> - </object> - <object class="wxButton" name="wxID_ADD"> - <label>&Add</label> - <default>1</default> - <pos>10,215</pos> - <size>50, 23</size> - </object> - <object class="wxChoice" name="choiceOperator"> - <pos>230,97</pos> - <size>60,23</size> - <content/> - <tooltip>Choose the operator for comparison.</tooltip> - </object> - <object class="wxButton" name="btnDel"> - <label>&Delete</label> - <default>1</default> - <pos>65,215</pos> - <size>50, 23</size> - </object> - <object class="wxListBox" name="listCondition"> - <style>wxLB_SINGLE|wxLB_NEEDED_SB</style> - <pos>10,245</pos> - <size>280,115</size> - <content/> - </object> - <object class="wxChoice" name="choiceJoinOp"> - <content> - <item>AND</item> - <item>OR</item> - </content> - <selection>0</selection> - <pos>120,216</pos> - <size>60,23</size> - </object> - </object> -</resource> Modified: trunk/pgadmin3/src/ui/xrcDialogs.cpp =================================================================== --- trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-10-07 09:52:43 UTC (rev 4518) +++ trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-10-07 10:32:24 UTC (rev 4519) @@ -10778,151 +10778,9 @@ 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_53 = 2965; +static size_t xml_res_size_53 = 4722; static unsigned char xml_res_file_53[] = { 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, -115,111,117,114,99,101,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97, -115,115,61,34,119,120,68,105,97,108,111,103,34,32,110,97,109,101,61,34, -102,114,109,81,66,74,111,105,110,34,62,10,32,32,32,32,60,116,105,116,108, -101,62,74,111,105,110,60,47,116,105,116,108,101,62,10,32,32,32,32,60,99, -101,110,116,101,114,101,100,62,49,60,47,99,101,110,116,101,114,101,100, -62,10,32,32,32,32,60,115,105,122,101,62,51,48,48,44,32,52,48,53,60,47,115, -105,122,101,62,10,32,32,32,32,60,115,116,121,108,101,62,119,120,83,84,65, -89,95,79,78,95,84,79,80,124,119,120,68,73,65,76,79,71,95,77,79,68,65,76, -124,119,120,67,65,80,84,73,79,78,124,119,120,83,89,83,84,69,77,95,77,69, -78,85,60,47,115,116,121,108,101,62,10,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,108,98,108,76,101,102,116,34,62,10,32,32, -32,32,32,32,60,108,97,98,101,108,62,76,101,102,116,32,84,97,98,108,101, -32,67,111,108,117,109,110,115,60,47,108,97,98,101,108,62,10,32,32,32,32, -32,32,60,112,111,115,62,49,48,44,32,49,48,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,83,116,97,116,105,99,84,101,120, -116,34,32,110,97,109,101,61,34,108,98,108,74,111,105,110,84,121,112,101, -34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,74,111,105,110,32,84, -121,112,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111, -115,62,49,48,44,32,49,48,48,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,83,116,97,116,105,99,84,101,120,116,34,32,110, -97,109,101,61,34,108,98,108,79,112,101,114,97,116,111,114,34,62,10,32,32, -32,32,32,32,60,108,97,98,101,108,62,79,112,101,114,97,116,111,114,60,47, -108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,49,56,53,44, -32,49,48,48,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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61, -34,108,98,108,82,105,103,104,116,34,62,10,32,32,32,32,32,32,60,108,97,98, -101,108,62,82,105,103,104,116,32,84,97,98,108,101,32,67,111,108,117,109, -110,115,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115, -62,49,48,44,49,51,48,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,38,97,109,112,59,67,97,110,99,101,108,60,47,108,97,98,101,108, -62,10,32,32,32,32,32,32,60,100,101,102,97,117,108,116,62,48,60,47,100,101, -102,97,117,108,116,62,10,32,32,32,32,32,32,60,112,111,115,62,50,49,52,44, -32,51,55,48,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101, -62,55,53,44,32,50,53,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,38,97,109,112,59,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,51,53,44,32,51,55,48,60,47, -112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,62,55,53,44,32,50, -53,60,47,115,105,122,101,62,10,32,32,32,32,32,32,60,115,116,121,108,101, -47,62,10,32,32,32,32,32,32,60,101,110,97,98,108,101,100,62,48,60,47,101, -110,97,98,108,101,100,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,67,104,111,105,99,101,34,32,110,97,109,101,61,34,99,104,111,105,99, -101,74,111,105,110,84,121,112,101,34,62,10,32,32,32,32,32,32,60,112,111, -115,62,54,48,44,57,55,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115, -105,122,101,62,49,48,48,44,50,51,60,47,115,105,122,101,62,10,32,32,32,32, -32,32,60,115,101,108,101,99,116,105,111,110,62,48,60,47,115,101,108,101, -99,116,105,111,110,62,10,32,32,32,32,32,32,60,112,111,115,47,62,10,32,32, -32,32,32,32,60,115,105,122,101,47,62,10,32,32,32,32,32,32,60,99,111,110, -116,101,110,116,62,10,32,32,32,32,32,32,32,32,60,105,116,101,109,62,73, -78,78,69,82,32,74,79,73,78,60,47,105,116,101,109,62,10,32,32,32,32,32,32, -32,32,60,105,116,101,109,62,76,69,70,84,32,74,79,73,78,60,47,105,116,101, -109,62,10,32,32,32,32,32,32,32,32,60,105,116,101,109,62,82,73,71,72,84, -32,74,79,73,78,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,60,105, -116,101,109,62,70,85,76,76,32,74,79,73,78,60,47,105,116,101,109,62,10,32, -32,32,32,32,32,32,32,60,105,116,101,109,62,67,82,79,83,83,32,74,79,73,78, -60,47,105,116,101,109,62,10,32,32,32,32,32,32,60,47,99,111,110,116,101, -110,116,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,76,105,115, -116,66,111,120,34,32,110,97,109,101,61,34,108,105,115,116,76,101,102,116, -34,62,10,32,32,32,32,32,32,60,112,111,115,62,49,48,44,50,53,60,47,112,111, -115,62,10,32,32,32,32,32,32,60,115,105,122,101,62,50,56,48,44,54,48,60, -47,115,105,122,101,62,10,32,32,32,32,32,32,60,112,111,115,47,62,10,32,32, -32,32,32,32,60,115,105,122,101,47,62,10,32,32,32,32,32,32,60,115,116,121, -108,101,62,119,120,76,66,95,83,73,78,71,76,69,124,119,120,76,66,95,78,69, -69,68,69,68,95,83,66,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32, -60,99,111,110,116,101,110,116,47,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,76,105,115,116,66,111,120,34,32,110,97,109,101,61,34,108, -105,115,116,82,105,103,104,116,34,62,10,32,32,32,32,32,32,60,112,111,115, -62,49,48,44,49,52,53,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105, -122,101,62,50,56,48,44,54,48,60,47,115,105,122,101,62,10,32,32,32,32,32, -32,60,115,116,121,108,101,62,119,120,76,66,95,83,73,78,71,76,69,124,119, -120,76,66,95,78,69,69,68,69,68,95,83,66,60,47,115,116,121,108,101,62,10, -32,32,32,32,32,32,60,99,111,110,116,101,110,116,47,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,83,116,97,116,105,99,84,101,120,116,34, -32,110,97,109,101,61,34,108,98,108,77,67,74,34,62,10,32,32,32,32,32,32, -60,108,97,98,101,108,62,77,117,108,116,105,112,108,101,32,67,111,108,117, -109,110,32,74,111,105,110,115,60,47,108,97,98,101,108,62,10,32,32,32,32, -32,32,60,112,111,115,62,49,56,53,44,32,50,50,48,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,65,68,68,34,62,10,32,32,32,32, -32,32,60,108,97,98,101,108,62,38,97,109,112,59,65,100,100,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,48,44,50,49,53,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105, -122,101,62,53,48,44,32,50,51,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,67,104,111,105,99,101,34,32,110,97,109, -101,61,34,99,104,111,105,99,101,79,112,101,114,97,116,111,114,34,62,10, -32,32,32,32,32,32,60,112,111,115,62,50,51,48,44,57,55,60,47,112,111,115, -62,10,32,32,32,32,32,32,60,115,105,122,101,62,54,48,44,50,51,60,47,115, -105,122,101,62,10,32,32,32,32,32,32,60,99,111,110,116,101,110,116,47,62, -10,32,32,32,32,32,32,60,116,111,111,108,116,105,112,62,67,104,111,111,115, -101,32,116,104,101,32,111,112,101,114,97,116,111,114,32,102,111,114,32, -99,111,109,112,97,114,105,115,111,110,46,60,47,116,111,111,108,116,105, -112,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,98,116,110,68,101,108,34,62,10,32,32, -32,32,32,32,60,108,97,98,101,108,62,38,97,109,112,59,68,101,108,101,116, -101,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,54,53,44,50,49,53,60,47,112,111,115,62,10,32,32,32,32, -32,32,60,115,105,122,101,62,53,48,44,32,50,51,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,76,105,115,116,66,111, -120,34,32,110,97,109,101,61,34,108,105,115,116,67,111,110,100,105,116,105, -111,110,34,62,10,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,76, -66,95,83,73,78,71,76,69,124,119,120,76,66,95,78,69,69,68,69,68,95,83,66, -60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,60,112,111,115,62,49, -48,44,50,52,53,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122, -101,62,50,56,48,44,49,49,53,60,47,115,105,122,101,62,10,32,32,32,32,32, -32,60,99,111,110,116,101,110,116,47,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,67,104,111,105,99,101,34,32,110,97,109,101,61,34,99,104, -111,105,99,101,74,111,105,110,79,112,34,62,10,32,32,32,32,32,32,60,99,111, -110,116,101,110,116,62,10,32,32,32,32,32,32,32,32,60,105,116,101,109,62, -65,78,68,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,60,105,116, -101,109,62,79,82,60,47,105,116,101,109,62,10,32,32,32,32,32,32,60,47,99, -111,110,116,101,110,116,62,10,32,32,32,32,32,32,60,115,101,108,101,99,116, -105,111,110,62,48,60,47,115,101,108,101,99,116,105,111,110,62,10,32,32, -32,32,32,32,60,112,111,115,62,49,50,48,44,50,49,54,60,47,112,111,115,62, -10,32,32,32,32,32,32,60,115,105,122,101,62,54,48,44,50,51,60,47,115,105, -122,101,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}; - -static size_t xml_res_size_54 = 4722; -static unsigned char xml_res_file_54[] = { -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,73,83,79,45,56,56,53,57,45,49,34,63,62, 10,60,114,101,115,111,117,114,99,101,62,10,32,32,60,111,98,106,101,99,116, 32,99,108,97,115,115,61,34,119,120,68,105,97,108,111,103,34,32,110,97,109, @@ -11141,8 +10999,8 @@ 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}; -static size_t xml_res_size_55 = 9076; -static unsigned char xml_res_file_55[] = { +static size_t xml_res_size_54 = 9076; +static unsigned char xml_res_file_54[] = { 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,73,83,79,45,56,56,53,57,45,49,34,63,62, 10,60,114,101,115,111,117,114,99,101,62,10,32,32,60,111,98,106,101,99,116, @@ -11557,8 +11415,8 @@ 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}; -static size_t xml_res_size_56 = 1882; -static unsigned char xml_res_file_56[] = { +static size_t xml_res_size_55 = 1882; +static unsigned char xml_res_file_55[] = { 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,73,83,79,45,56,56,53,57,45,49,34,63,62, 10,60,114,101,115,111,117,114,99,101,62,10,32,32,60,111,98,106,101,99,116, @@ -11715,10 +11573,9 @@ wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmMaintenance.xrc"), xml_res_file_50, xml_res_size_50); wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmOptions.xrc"), xml_res_file_51, xml_res_size_51); wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmPassword.xrc"), xml_res_file_52, xml_res_size_52); - wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmQBJoin.xrc"), xml_res_file_53, xml_res_size_53); - wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmRestore.xrc"), xml_res_file_54, xml_res_size_54); - wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmStatus.xrc"), xml_res_file_55, xml_res_size_55); - wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmUpdate.xrc"), xml_res_file_56, xml_res_size_56); + wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmRestore.xrc"), xml_res_file_53, xml_res_size_53); + wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmStatus.xrc"), xml_res_file_54, xml_res_size_54); + wxMemoryFSHandler::AddFile(wxT("XRC_resource/xrcDialogs.cpp$._frmUpdate.xrc"), xml_res_file_55, xml_res_size_55); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._dlgAggregate.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._dlgCast.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._dlgCheck.xrc")); @@ -11772,7 +11629,6 @@ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmMaintenance.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmOptions.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmPassword.xrc")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmQBJoin.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmRestore.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmStatus.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/xrcDialogs.cpp$._frmUpdate.xrc"));
pgadmin-hackers by date: