public inbox for [email protected]
help / color / mirror / Atom feedFrom: Adam Scott <[email protected]>
To: Dave Page <[email protected]>
Cc: Magnus Hagander <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: Patch: New field in frmMain statusbar
Date: Wed, 23 Sep 2015 13:15:38 -0600
Message-ID: <CA+s62-PgwLLpG01ZYxfxVWYwx0hDZoACtbu-Y3qwNS=fVmFf2A@mail.gmail.com> (raw)
In-Reply-To: <CA+OCxoyfGdDpHTcm_Hq1GOmRFfRnSdk9wjHwSqoBMV83xcMv1g@mail.gmail.com>
References: <CA+s62-Ous9Dr7EFGfwEh-N7xZGh8f173uUU=VbzzgV9crVD4NQ@mail.gmail.com>
<CA+OCxoxnayiMBczvgwCSvd8vLdJ6zjjAU+Sb68bE+h5JbYH5CA@mail.gmail.com>
<CABUevEwiW5FJuOp2-eBBWvAURnRV5xDiR6N8ET4juWatLPWsdA@mail.gmail.com>
<CA+s62-PDmPApuCvzAziewCtZnDD1sAkOwnnwW6odhWaXE2hF+w@mail.gmail.com>
<CABUevEzVwKWKwOajTSWnC2+8CpcOtp-dYPyYOMEj31eaUXNkAg@mail.gmail.com>
<CA+OCxox1Ky8VXLEzLNoFj77_V5u=hbjnnvffELk1dicazm=s2A@mail.gmail.com>
<CABUevEwmoneWk9-n1uJeTxtr7KYzHBmbWEfGwN0Uwx+fR0T4=A@mail.gmail.com>
<CA+OCxoyL_OaiDW8s+6znck8mYJPzpt95ruqZgz2kA3ZxUdXzMQ@mail.gmail.com>
<CA+s62-Ndv0B8hDkXMVyhr0o_wHmc3R3HyKfx9nGhXSZNTQgY0w@mail.gmail.com>
<CA+s62-PP_6ZQmnbzrn2Vb0iLiVHdp6jYsUb33jAYjTqRV93tUw@mail.gmail.com>
<CA+OCxowaBvS3szDk4Jc0F=nSkDG52JWguFpSc1BgPZ9xgbzeXA@mail.gmail.com>
<CA+s62-M+TM-TDhUJoz5ap0D2ZLWymXGx9Lnh+cj+E8mSmcmXLA@mail.gmail.com>
<CA+s62-OB98EwCzhV6MGR+w1MG574J6_8OfS8C-shzNXJ5gWvPQ@mail.gmail.com>
<CA+OCxoyfGdDpHTcm_Hq1GOmRFfRnSdk9wjHwSqoBMV83xcMv1g@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgadmin-hackers>
Thank you Dave! I rebased from master. To get it to build is going to
take some research. It looks like it wants openssl, which I grabbed and
configured for WIN32, but it's not happy. First error is below. But this
patch is so straightforward, I'm sharing anyway for the sake of time, as it
was working before.
2>c:\pgadmin3\pgadmin\libssh2\openssl.c(71): error C2037: left of 'e'
specifies undefined struct/union 'rsa_st'
Thanks again!
Adam
On Wed, Sep 23, 2015 at 8:35 AM, Dave Page <[email protected]> wrote:
> On Wed, Sep 23, 2015 at 2:55 PM, Adam Scott <[email protected]>
> wrote:
> > Is the last patch okay? If there's something more required or anything
> > please let me know.
>
> Hi
>
> The patch does not apply for me. Can you rebase it against master please?
>
> Thanks.
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[application/octet-stream] 0001-Display-Connection-and-Database-in-Statusbar-Add-ano.patch (1.7K, 3-0001-Display-Connection-and-Database-in-Statusbar-Add-ano.patch)
download | inline diff:
From 0ea56367c51422329ed761e04f314451d6777a48 Mon Sep 17 00:00:00 2001
From: Adam C Scott <[email protected]>
Date: Mon, 14 Sep 2015 13:16:46 -0600
Subject: [PATCH] Display Connection and Database in Statusbar: Add another
field in frmMain's statusbar to get the current object's connection and
database and display in the field in the status bar.
---
pgadmin/frm/frmMain.cpp | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/pgadmin/frm/frmMain.cpp b/pgadmin/frm/frmMain.cpp
index 8629dda..570701b 100644
--- a/pgadmin/frm/frmMain.cpp
+++ b/pgadmin/frm/frmMain.cpp
@@ -516,13 +516,13 @@ void frmMain::CreateMenus()
treeContextMenu = 0;
// Status bar
- statusBar = CreateStatusBar(3);
- int iWidths[3] = {0, -1, 100};
- SetStatusWidths(3, iWidths);
+ statusBar = CreateStatusBar(4);
+ int iWidths[4] = {0, -1, 400, 100};
+ SetStatusWidths(4, iWidths);
SetStatusBarPane(-1);
statusBar->SetStatusText(wxT(""), 0);
statusBar->SetStatusText(_("Ready."), 1);
- statusBar->SetStatusText(_("0 Secs"), 2);
+ statusBar->SetStatusText(_("0 Secs"), 3);
wxAcceleratorEntry entries[4];
entries[0].Set(wxACCEL_NORMAL, WXK_F5, refFact->GetId());
@@ -1354,7 +1354,18 @@ void frmMain::EndMsg(bool done)
float timeval = stopwatch.Time();
wxString time;
time.Printf(_("%.2f secs"), (timeval / 1000));
- statusBar->SetStatusText(time, 2);
+ statusBar->SetStatusText(time, 3);
+
+ // Display the name of the connection for currently selected object
+ wxString connection;
+ if (currentObject)
+ {
+ pgConn *conn = currentObject->GetConnection();
+
+ if (conn)
+ connection = conn->GetName();
+ }
+ statusBar->SetStatusText(connection,2);
// Display the 'Done' message
if (done)
--
2.5.2.windows.1
view thread (20+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected]
Subject: Re: Patch: New field in frmMain statusbar
In-Reply-To: <CA+s62-PgwLLpG01ZYxfxVWYwx0hDZoACtbu-Y3qwNS=fVmFf2A@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox