On Friday, May 17, 2013, Michael Shapiro wrote:

> I am running 1.16.1 (Windows 7). I can reproduce this. It makes a
> difference, though, if you use ctrl-c vs the right-click/Copy. ctrl-c does
> the whole entry, right-click/Copy gets just what is highlighted. ctrl-c
> gets the whole entry even if nothing is highlighted.
>
>
> On Fri, May 17, 2013 at 5:34 AM, Kieran 
> <kieran.mccus...@kwest.co<javascript:_e({}, 'cvml', 
> 'kieran.mccus...@kwest.co');>
> > wrote:
>
>> Hi
>>
>> Sorry if this has been raised before, but it's been a nuisance to me for
>> quite a while and I thought I should mention it.
>>
>> To reproduce the problem :-
>>
>> 1. Open the Edit Data window on a table
>> 2. Click into a text field containing some text and highlight a single
>> word
>> 3. Paste what you have just copied.
>>
>> You will get the whole contents of the field not what you just
>> highlighted.
>>
>> My environment is
>> Windows Vista
>> pgAdmin 1.16.1
>>
>>
I believe the attached patch fixes this. With it, if you're in Edit Mode in
a cell, then Copy works more like it would in a regular text box - only the
highlighted text is copied, and there are no quotes etc. added. In View
Mode, whatever cells are selected will be copied, and quoting/delimiting
applied.

Can someone review it please (Dhiraj :-p )?

Thanks.


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/pgadmin/ctl/ctlSQLGrid.cpp b/pgadmin/ctl/ctlSQLGrid.cpp
index 9d1a533..a217283 100644
--- a/pgadmin/ctl/ctlSQLGrid.cpp
+++ b/pgadmin/ctl/ctlSQLGrid.cpp
@@ -25,7 +25,6 @@
 #define EXTRAEXTENT_WIDTH  6
 
 BEGIN_EVENT_TABLE(ctlSQLGrid, wxGrid)
-	EVT_MENU(MNU_COPY, ctlSQLGrid::OnCopy)
 	EVT_MOUSEWHEEL(ctlSQLGrid::OnMouseWheel)
 END_EVENT_TABLE()
 
@@ -51,11 +50,6 @@ ctlSQLGrid::ctlSQLGrid(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 	SetColLabelSize(fntLabel.GetPointSize() * 4);
 	SetDefaultCellOverflow(false);
 
-	wxAcceleratorEntry entries[1];
-	entries[0].Set(wxACCEL_CTRL,                (int)'C',      MNU_COPY);
-	wxAcceleratorTable accel(1, entries);
-	SetAcceleratorTable(accel);
-
 	Connect(wxID_ANY, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler(ctlSQLGrid::OnLabelDoubleClick));
 }
 
diff --git a/pgadmin/frm/frmEditGrid.cpp b/pgadmin/frm/frmEditGrid.cpp
index 8df535b..2cd9327 100644
--- a/pgadmin/frm/frmEditGrid.cpp
+++ b/pgadmin/frm/frmEditGrid.cpp
@@ -732,15 +732,22 @@ void frmEditGrid::OnCopy(wxCommandEvent &ev)
 				if (sqlGrid->GetTable()->IsColText(sqlGrid->GetGridCursorCol()))
 				{
 					wxStyledTextCtrl *text = (wxStyledTextCtrl *)sqlGrid->GetCellEditor(sqlGrid->GetGridCursorRow(), sqlGrid->GetGridCursorCol())->GetControl();
-					if (text)
+					if (text && !text->GetSelectedText().IsEmpty())
+					{
 						wxTheClipboard->SetData(new wxTextDataObject(text->GetSelectedText()));
+						SetStatusText(_("Data from one cell copied to clipboard."));
+					}
 				}
 				else
 				{
 					wxTextCtrl *text = (wxTextCtrl *)sqlGrid->GetCellEditor(sqlGrid->GetGridCursorRow(), sqlGrid->GetGridCursorCol())->GetControl();
-					if (text)
+					if (text && !text->GetStringSelection().IsEmpty())
+					{
 						wxTheClipboard->SetData(new wxTextDataObject(text->GetStringSelection()));
+						SetStatusText(_("Data from one cell copied to clipboard."));
+					}
 				}
+
 				wxTheClipboard->Close();
 			}
 		}
-- 
Sent via pgadmin-support mailing list (pgadmin-support@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-support

Reply via email to