SVN Commit by andreas: r4516 - in trunk/pgadmin3: docs/en_US src/frm src/include src/schema - Mailing list pgadmin-hackers
| From | svn@pgadmin.org |
|---|---|
| Subject | SVN Commit by andreas: r4516 - in trunk/pgadmin3: docs/en_US src/frm src/include src/schema |
| Date | |
| Msg-id | 200510061706.j96H6J22005778@developer.pgadmin.org Whole thread Raw |
| List | pgadmin-hackers |
Author: andreas
Date: 2005-10-06 18:06:18 +0100 (Thu, 06 Oct 2005)
New Revision: 4516
Added:
trunk/pgadmin3/docs/en_US/slony-functions.html
Modified:
trunk/pgadmin3/docs/en_US/guruhints.html
trunk/pgadmin3/src/frm/frmHint.cpp
trunk/pgadmin3/src/frm/frmRestore.cpp
trunk/pgadmin3/src/include/frmHint.h
trunk/pgadmin3/src/schema/pgDatabase.cpp
trunk/pgadmin3/src/schema/pgServer.cpp
trunk/pgadmin3/src/schema/pgTable.cpp
Log:
Fix hint suppression to make Dave happy again :-)
fix Restore translation to make Hiroshi happy
fix typos and missing files
Modified: trunk/pgadmin3/docs/en_US/guruhints.html
===================================================================
--- trunk/pgadmin3/docs/en_US/guruhints.html 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/docs/en_US/guruhints.html 2005-10-06 17:06:18 UTC (rev 4516)
@@ -28,7 +28,7 @@
<p>
If you check 'do not show this hint again', the automatic popup of the individual hint will be
suppressed in the future, until it is reset in the
-<a href='options-tab2.html'>options</a>). Error messages will still appear, but without
+<a href='options-tab2.html'>options</a>. Error messages will still appear, but without
the extended information as privided by the hints.
</p>
</body>
Added: trunk/pgadmin3/docs/en_US/slony-functions.html
===================================================================
--- trunk/pgadmin3/docs/en_US/slony-functions.html 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/docs/en_US/slony-functions.html 2005-10-06 17:06:18 UTC (rev 4516)
@@ -0,0 +1,41 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<link rel="STYLESHEET" type="text/css" href="pgadmin3.css">
+<title>Slony-I tasks</title>
+</head>
+
+<body>
+<h3>Slony-I tasks</h3>
+<p>
+In the appropriate context, pgAdmin III can trigger several maintenance tasks.
+<UL>
+ <LI><P>
+ <b id='restart'>Restart node</b> - Under some conditions, it may be necessary
+ to restart a slon process on a node, initialize as if freshly started and make it reload
+ its configuration. This can be triggered remotely with the restart node function.
+ </P>
+ <LI><P>
+ <b id='lock'>Lock set</b> - Disables updates to a set to be replicated. This is
+ necessary for clean switch over the source of a replication from one node to another.
+ </P>
+ <LI><P>
+ <b id='unlock'>Unlock set</b> - Re-enables updates to a set to be replicated
+ after a previous lock.
+ </P>
+ <LI><P>
+ <b id='merge'>Merge set</b> - Joins two sets, originating from the same node
+ and subscribed by the same nodes, into one. This can be used as a workaround to
+ the fact that a subscribed set can't be extended.
+ </P>
+ <LI><P>
+ <b id='move'>Move set</b> - Moves a replication set from one node to another,
+ i.e. making the target node the new source. The old node will become subscriber
+ to the new provider node. This is the normal way how to switch over gracefully
+ the master role from one node to another.
+ </P>
+</UL>
+</p>
+</body>
+</html>
Modified: trunk/pgadmin3/src/frm/frmHint.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmHint.cpp 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/frm/frmHint.cpp 2005-10-06 17:06:18 UTC (rev 4516)
@@ -375,18 +375,24 @@
-int frmHint::ShowHint(wxWindow *fr, const wxArrayString &hints, const wxString &info)
+int frmHint::ShowHint(wxWindow *fr, const wxArrayString &hints, const wxString &info, bool force)
{
- // force implied
wxArrayInt hintnos;
size_t i;
if(!hints.GetCount())
return wxID_OK;
for (i=0 ; i < hints.GetCount() ; i++)
- hintnos.Add(GetHintNo(hints.Item(i)));
+ {
+ int hintNo=GetHintNo(hints.Item(i));
+ if (hintNo >= 0 && (force || WantHint(hintNo)))
+ hintnos.Add(hintNo);
+ }
- frmHint *frm=new frmHint(fr, hints.GetCount() > 1);
+ if (!hintnos.GetCount())
+ return wxID_OK;
+
+ frmHint *frm=new frmHint(fr, force);
frm->SetHint(hintnos, info);
frm->CenterOnParent();
Modified: trunk/pgadmin3/src/frm/frmRestore.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmRestore.cpp 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/frm/frmRestore.cpp 2005-10-06 17:06:18 UTC (rev 4516)
@@ -449,7 +449,7 @@
restoreFactory::restoreFactory(menuFactoryList *list, wxMenu *mnu, wxToolBar *toolbar) : contextActionFactory(list)
{
- mnu->Append(id, __("&Restore"), _("Restores a backup from a local file"));
+ mnu->Append(id, _("&Restore"), _("Restores a backup from a local file"));
}
Modified: trunk/pgadmin3/src/include/frmHint.h
===================================================================
--- trunk/pgadmin3/src/include/frmHint.h 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/include/frmHint.h 2005-10-06 17:06:18 UTC (rev 4516)
@@ -36,7 +36,7 @@
{
public:
static int ShowHint(wxWindow *fr, const wxString &hint, const wxString &info=wxEmptyString, bool force=false);
- static int ShowHint(wxWindow *fr, const wxArrayString &hints, const wxString &info=wxEmptyString);
+ static int ShowHint(wxWindow *fr, const wxArrayString &hints, const wxString &info=wxEmptyString, bool
force=false);
static bool WantHint(const wxString &hint);
static void ResetHints();
Modified: trunk/pgadmin3/src/schema/pgDatabase.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgDatabase.cpp 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/schema/pgDatabase.cpp 2005-10-06 17:06:18 UTC (rev 4516)
@@ -166,7 +166,7 @@
hints.Add(HINT_INSTRUMENTATION);
if (force || !hintShown)
- frmHint::ShowHint(form, hints, GetFullIdentifier());
+ frmHint::ShowHint(form, hints, GetFullIdentifier(), force);
hintShown=true;
}
Modified: trunk/pgadmin3/src/schema/pgServer.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgServer.cpp 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/schema/pgServer.cpp 2005-10-06 17:06:18 UTC (rev 4516)
@@ -169,7 +169,7 @@
hints.Add(HINT_AUTOVACUUM);
if (force || !hintShown)
- frmHint::ShowHint(form, hints, GetFullIdentifier());
+ frmHint::ShowHint(form, hints, GetFullIdentifier(), force);
hintShown=true;
}
Modified: trunk/pgadmin3/src/schema/pgTable.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgTable.cpp 2005-10-06 17:02:41 UTC (rev 4515)
+++ trunk/pgadmin3/src/schema/pgTable.cpp 2005-10-06 17:06:18 UTC (rev 4516)
@@ -498,7 +498,7 @@
if (primaryKey.IsEmpty())
hints.Add(HINT_PRIMARYKEY);
- rc=frmHint::ShowHint(form, hints, GetFullIdentifier());
+ rc=frmHint::ShowHint(form, hints, GetFullIdentifier(), force);
}
else
rc=frmHint::ShowHint(form, HINT_VACUUM, GetFullIdentifier(), force);
pgadmin-hackers by date: