Skip to content
This repository has been archived by the owner on Sep 15, 2022. It is now read-only.

Commit

Permalink
Some more replication stuff
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.pgadmin.org/trunk@4483 a7884b65-44f6-0310-8a51-81a127f17b15
  • Loading branch information
Andreas Pflug committed Oct 3, 2005
1 parent 545ca04 commit 9a5d06f
Show file tree
Hide file tree
Showing 18 changed files with 699 additions and 231 deletions.
2 changes: 1 addition & 1 deletion docs/de_DE/hints/conn-ident.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3>Ident-Authentifizierung fehlgeschlagen</h3>
</p>
<p>
Dieses Beispiel erlaubt MD5-verschlüsselten Paßwortzugriff auf alle Datenbanken für alle Benutzer im
privaten Netzwerksegment 192.1680.0/24.
privaten Netzwerksegment 192.168.0.0/24.
</p>
<p>
Zum Editieren der pg_hba.conf-Datei kann der in pgAdmin III eingebaute Editor verwendet werden.
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/hints/conn-ident.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3>Ident authentication failed</h3>
<b><tt class="command">host all all 192.168.0.0/24 md5</tt></b>
</p>
<p>
This example grants MD5 encrypted password access to all databases to all users on the private network 192.1680.0/24.
This example grants MD5 encrypted password access to all databases to all users on the private network 192.168.0.0/24.
</p>
<p>
You can use the pg_hba.conf editor that is built into pgAdmin III to edit the pg_hba.conf
Expand Down
4 changes: 2 additions & 2 deletions src/dlg/dlgRole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ wxString dlgRole::GetSql()
if (createDB)
sql += wxT(" CREATEDB");
if (createRole)
sql += wxT(" CREATERROLE");
sql += wxT(" CREATEROLE");
if (datValidUntil->GetValue().IsValid())
sql += wxT("\n VALID UNTIL ") + qtString(DateToAnsiStr(datValidUntil->GetValue() + timValidUntil->GetValue()));
else
Expand All @@ -652,7 +652,7 @@ wxString dlgRole::GetSql()
sql += wxT(";\n");

if (chkUpdateCat->GetValue())
sql += wxT("UPDATE pg_authid SET rolcatupdate=true WHERE OID=") + role->GetOidStr() + wxT(";\n");
sql += wxT("UPDATE pg_authid SET rolcatupdate=true WHERE rolname=") + qtString(name) + wxT(";\n");

cnt=lstVariables->GetItemCount();
for (pos=0 ; pos < cnt ; pos++)
Expand Down
2 changes: 2 additions & 0 deletions src/frm/frmMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ frmMain::frmMain(const wxString& title)
new slonyRestartFactory(menuFactories, slonyMenu, 0);
new slonyUpgradeFactory(menuFactories, slonyMenu, 0);
new slonyFailoverFactory(menuFactories, slonyMenu, 0);
new slonyLockSetFactory(menuFactories, slonyMenu, 0);
new slonyUnlockSetFactory(menuFactories, slonyMenu, 0);
new slonyMergeSetFactory(menuFactories, slonyMenu, 0);
new slonyMoveSetFactory(menuFactories, slonyMenu, 0);
toolsMenu->Append(MNU_SLONY_SUBMENU, _("Replication"), slonyMenu);
Expand Down
68 changes: 68 additions & 0 deletions src/include/images/slnode-disabled.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/* XPM */
static char * slnode_disabled_xpm[] = {
"16 16 49 1",
" c None",
". c #B0B0B0",
"+ c #797979",
"@ c #D4D4D4",
"# c #D2D2D2",
"$ c #C7C7C7",
"% c #C6C6C6",
"& c #C3C3C3",
"* c #C1C1C1",
"= c #B5B5B5",
"- c #909090",
"; c #ACACAC",
"> c #BABABA",
", c #B8B8B8",
"' c #AAAAAA",
") c #8F8F8F",
"! c #A9A9A9",
"~ c #BBBBBB",
"{ c #B2B2B2",
"] c #AFAFAF",
"^ c #B4B4B4",
"/ c #8E8E8E",
"( c #AEAEAE",
"_ c #ADADAD",
": c #ABABAB",
"< c #898989",
"[ c #C0C0C0",
"} c #B3B3B3",
"| c #A8A8A8",
"1 c #A5A5A5",
"2 c #A6A6A6",
"3 c #B6B6B6",
"4 c #BCBCBC",
"5 c #A3A3A3",
"6 c #B1B1B1",
"7 c #868686",
"8 c #A1A1A1",
"9 c #A0A0A0",
"0 c #888888",
"a c #858585",
"b c #7A7A7A",
"c c #CDCDCD",
"d c #B9B9B9",
"e c #A4A4A4",
"f c #BDBDBD",
"g c #7F7F7F",
"h c #7E7E7E",
"i c #838383",
"j c #818181",
" ",
" .++. ",
" +@#+ ",
" +$%+ ",
" +&*+ ",
" =-;>,')! ",
" -~~{]^=/ ",
" (]~._:!.!( ",
" <[}_:|123< ",
" <4]:|1556< ",
" 67,_|1589;76 ",
" 0.=;|158922a8 ",
" bc~>:d{.^e_'fb ",
" b=;ggg<<ghh1:b ",
" 6i] ,]j ",
" "};
127 changes: 127 additions & 0 deletions src/include/images/slnode-local.xpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/* XPM */
static char * slnode_local_xpm[] = {
"16 16 108 2",
" c None",
". c #BB95CB",
"+ c #8C4AA7",
"@ c #D1BDEB",
"# c #D0BBE9",
"$ c #C2A8E5",
"% c #C0A6E5",
"& c #BDA1E4",
"* c #BC9FE2",
"= c #BF9BCE",
"- c #9E68B8",
"; c #B28ACE",
"> c #B494E0",
", c #B191DE",
"' c #AF87CC",
") c #9D66B7",
"! c #B58CC6",
"~ c #B3C37D",
"{ c #809B26",
"] c #B8ACB1",
"^ c #B595E0",
"/ c #AA87DC",
"( c #A883DB",
"_ c #AE8CDB",
": c #B694D5",
"< c #9C65B6",
"[ c #9CB953",
"} c #A0C256",
"| c #9AA86C",
"1 c #ADA1AF",
"2 c #A993BE",
"3 c #938D81",
"4 c #AA9FA9",
"5 c #AB87D8",
"6 c #AF87CA",
"7 c #BA92CA",
"8 c #96AC4B",
"9 c #B8E581",
"0 c #B2E17B",
"a c #829C29",
"b c #93AA46",
"c c #97CA5B",
"d c #7E9922",
"e c #A079D3",
"f c #B595D6",
"g c #9A60B2",
"h c #4882BE",
"i c #7071B8",
"j c #648F70",
"k c #8AB55B",
"l c #9CD063",
"m c #8FC150",
"n c #8DC250",
"o c #9D74D2",
"p c #B08ED3",
"q c #73C7DF",
"r c #71C4DE",
"s c #6FC1DD",
"t c #6ABBDA",
"u c #668F65",
"v c #91C959",
"w c #8AC451",
"x c #82BB46",
"y c #9A70D0",
"z c #AB86D1",
"A c #975CB0",
"B c #BC96CC",
"C c #6EC1DD",
"D c #62AED4",
"E c #54889B",
"F c #81B85B",
"G c #86C14D",
"H c #7FBD46",
"I c #7AB53E",
"J c #9A70CF",
"K c #A17AD1",
"L c #AB82C9",
"M c #955AB0",
"N c #AE81C1",
"O c #6EC0DD",
"P c #6BBDDB",
"Q c #68B9DA",
"R c #4982BA",
"S c #709249",
"T c #A87FC9",
"U c #AB88D2",
"V c #A682D1",
"W c #BCA0D9",
"X c #8D4BA8",
"Y c #6C9BCB",
"Z c #569BCB",
"` c #61B0D5",
" . c #607DBC",
".. c #9253AB",
"+. c #9051AB",
"@. c #AD83C6",
"#. c #B18BCB",
"$. c #93B5D9",
"%. c #6E9CCB",
"&. c #9359AF",
"*. c #6A99CA",
"=. c #5DAAD3",
"-. c #5398C9",
";. c #C2A0D0",
">. c #BA93CB",
",. c #9255AD",
"'. c #6B9BCB",
"). c #6198CA",
" ",
" . + + . ",
" + @ # + ",
" + $ % + ",
" + & * + ",
" = - ; > , ' ) ! ",
" ~ { ] ^ / ( _ : < ",
" [ } | 1 2 3 4 5 6 7 ",
" 8 9 0 a b c d e f g ",
"h h h i j k l m n d o p g ",
"h q r s t u v w x d y z A B ",
"h r C D E F G H I d J K L M N ",
"h O P Q R S d d d d T U V W X ",
"h D Y Z ` ...g g ..+.+.@.#.X ",
"$.%.&.*.=.-.h ;.>.,. ",
" '.). "};
Loading

0 comments on commit 9a5d06f

Please sign in to comment.