Log Message:
-----------
more Hint enhancements
Modified Files:
--------------
pgadmin3/src/include:
frmMain.h (r1.64 -> r1.65)
pgadmin3/src/schema:
pgObject.cpp (r1.81 -> r1.82)
pgServer.cpp (r1.63 -> r1.64)
pgTablespace.cpp (r1.12 -> r1.13)
pgUser.cpp (r1.40 -> r1.41)
pgadmin3/src/ui:
events.cpp (r1.131 -> r1.132)
frmMain.cpp (r1.127 -> r1.128)
pgadmin3/src/ui/common:
xrcDialogs.cpp (r1.61 -> r1.62)
Index: frmMain.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmMain.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -Lsrc/include/frmMain.h -Lsrc/include/frmMain.h -u -w -r1.64 -r1.65
--- src/include/frmMain.h
+++ src/include/frmMain.h
@@ -43,7 +43,7 @@
wxString GetHelpPage() const;
void StartMsg(const wxString& msg);
- void EndMsg();
+ void EndMsg(bool done=true);
void SetStatusText(const wxString &msg);
void SetCurrentObject(pgObject *data) { currentObject = data; }
Index: pgObject.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgObject.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -Lsrc/schema/pgObject.cpp -Lsrc/schema/pgObject.cpp -u -w -r1.81 -r1.82
--- src/schema/pgObject.cpp
+++ src/schema/pgObject.cpp
@@ -434,7 +434,7 @@
ShowTreeDetail(browser, form, properties, sqlPane);
if (form)
- form->EndMsg();
+ form->EndMsg(!GetConnection() || GetConnection()->GetStatus() ==
PGCONN_OK);
}
Index: pgUser.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgUser.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lsrc/schema/pgUser.cpp -Lsrc/schema/pgUser.cpp -u -w -r1.40 -r1.41
--- src/schema/pgUser.cpp
+++ src/schema/pgUser.cpp
@@ -163,7 +163,7 @@
wxT(" WHERE oprowner = ") + uid + wxT(" AND op.oid > ") + sysoid +
wxT("\n")
wxT(" ORDER BY 1,2,3"));
- form->EndMsg();
+ form->EndMsg(set != 0);
}
Index: pgTablespace.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.12
-r1.13
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -80,7 +80,7 @@
wxT(" OR (cl.reltablespace=0 AND dattablespace = ") +
GetOidStr() + wxT("))\n")
wxT(" ORDER BY 1,2,3"));
- form->EndMsg();
+ form->EndMsg(set != 0);
}
Index: pgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgServer.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -Lsrc/schema/pgServer.cpp -Lsrc/schema/pgServer.cpp -u -w -r1.63 -r1.64
--- src/schema/pgServer.cpp
+++ src/schema/pgServer.cpp
@@ -414,10 +414,10 @@
form->StartMsg(_("Connecting to database"));
conn = new pgConn(GetName(), database, username, password, port, ssl);
- form->EndMsg();
if (!conn)
{
+ form->EndMsg(false);
wxLogError(__("Couldn't create a connection object!"));
return PGCONN_BAD;
}
@@ -466,13 +466,16 @@
{
error.Printf(_("The PostgreSQL server must be at least version
%2.1f!"), SERVER_MIN_VERSION);
connected = false;
- return PGCONN_BAD;
+ status = PGCONN_BAD;
}
}
else
+ {
connected = FALSE;
+ }
+ form->EndMsg(connected && status == PGCONN_OK);
return status;
}
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.131 -r1.132
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -259,7 +259,7 @@
bool rc = server->StartService();
if (rc)
execSelChange(server->GetId(), true);
- EndMsg();
+ EndMsg(rc);
}
}
@@ -284,7 +284,7 @@
OnDisconnect(nullEvent);
execSelChange(server->GetId(), true);
}
- EndMsg();
+ EndMsg(rc);
}
}
Index: frmMain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.127 -r1.128
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -444,6 +444,8 @@
pgObject *newData = data->Refresh(browser, currentItem);
+ bool done = !data->GetConnection() || data->GetConnection()->GetStatus()
== PGCONN_OK;
+
if (newData != data)
{
wxLogInfo(wxT("Deleting ") + data->GetTypeName() + wxT(" ")
@@ -472,7 +474,7 @@
if (currentItem)
execSelChange(currentItem, currentItem == browser->GetSelection());
browser->Thaw();
- EndMsg();
+ EndMsg(done);
}
@@ -752,7 +754,7 @@
browser->Expand(item);
browser->EnsureVisible(item);
}
- EndMsg();
+ EndMsg(item);
return res;
}
case PGCONN_DNSERR:
@@ -1148,7 +1150,7 @@
}
-void frmMain::EndMsg()
+void frmMain::EndMsg(bool done)
{
msgLevel--;
@@ -1161,7 +1163,11 @@
statusBar->SetStatusText(time, 2);
// Display the 'Done' message
+ if (done)
statusBar->SetStatusText(timermsg + _(" Done."), 1);
+ else
+ statusBar->SetStatusText(timermsg + _(" Failed."), 1);
+
wxLogStatus(wxT("%s (%s)"), timermsg.c_str(), time.c_str());
wxEndBusyCursor();
}
Index: xrcDialogs.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.61
-r1.62
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -8973,7 +8973,7 @@
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_46 = 2531;
+static size_t xml_res_size_46 = 3179;
static unsigned char xml_res_file_46[] = {
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,
@@ -9018,7 +9018,7 @@
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,119,120,70,108,
101,120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,
-32,32,32,60,99,111,108,115,62,53,60,47,99,111,108,115,62,10,32,32,32,32,
+32,32,32,60,99,111,108,115,62,55,60,47,99,111,108,115,62,10,32,32,32,32,
32,32,32,32,32,32,60,114,111,119,115,62,49,60,47,114,111,119,115,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,
@@ -9055,44 +9055,73 @@
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,79,75,
-34,62,10,32,32,32,32,32,32,32,32,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,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,57,51,44,49,51,53,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,
+66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,89,69,
+83,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
+108,62,38,97,109,112,59,89,101,115,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,57,51,44,49,51,53,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,78,79,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,38,
+97,109,112,59,78,111,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,57,51,44,49,51,53,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,65,78,67,69,76,34,62,
-10,32,32,32,32,32,32,32,32,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,32,32,32,32,32,32,32,32,60,112,111,115,62,49,52,54,44,49,51,
-53,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,124,119,120,69,88,80,65,78,68,124,
-119,120,71,82,79,87,124,119,120,65,76,73,71,78,95,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,103,114,111,119,97,98,108,101,99,111,108,115,62,49,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,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,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};
+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,32,32,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,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,57,
+51,44,49,51,53,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,65,78,67,69,76,34,62,10,32,32,32,32,32,
+32,32,32,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,32,32,
+32,32,32,32,32,32,60,112,111,115,62,49,52,54,44,49,51,53,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,124,119,120,69,88,80,65,78,68,124,119,120,71,82,
+79,87,124,119,120,65,76,73,71,78,95,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,103,114,
+111,119,97,98,108,101,99,111,108,115,62,49,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,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,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_47 = 1439;
static unsigned char xml_res_file_47[] = {
---------------------------(end of broadcast)---------------------------
TIP 6: Have you searched our list archives?
http://archives.postgresql.org
