Add modificator Ctrl for popup menu "List columns header"

При нажатом Ctrl в буфер обмена копируются только имена столбцов с разделителем ",".
levinsv · Jun 17, 2024 · e2eeabf · e2eeabf
1 parent 38b4b4a
commit e2eeabf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ctl/ctlSQLResult.cpp b/ctl/ctlSQLResult.cpp
@@ -339,7 +339,7 @@ wxString ctlSQLResult::OnGetItemText(long item, long col) const
 	}
 	return wxEmptyString;
 }
-wxString ctlSQLResult::CopySelColumnNameType()
+wxString ctlSQLResult::CopySelColumnNameType(bool onlyname)
 {
 	wxString ss = wxEmptyString;
 	if (GetSelectedCols().GetCount()) {
@@ -356,7 +356,8 @@ wxString ctlSQLResult::CopySelColumnNameType()
 			wxString colName = colNames.Item(cl);
 			wxString colType = colTypes.Item(cl);
 			if (!ss.IsEmpty()) ss.Append(", ");
-			ss.Append(colName + " " + colType);
+			ss.Append(colName);
+			if (!onlyname) ss.Append(" " + colType);
 
 		}
 	}

diff --git a/frm/frmQuery.cpp b/frm/frmQuery.cpp
@@ -2321,7 +2321,8 @@ void frmQuery::OnCopy_NameTypeCols(wxCommandEvent& ev)
 {
 	//	if (currentControl() == sqlResult)
 	{
-		wxString s = sqlResult->CopySelColumnNameType();
+		bool press=wxGetKeyState(WXK_CONTROL);
+		wxString s = sqlResult->CopySelColumnNameType(press);
 		SetStatusText(s, STATUSPOS_MSGS);
 	}
 }

diff --git a/include/ctl/ctlSQLResult.h b/include/ctl/ctlSQLResult.h
@@ -51,7 +51,7 @@ class ctlSQLResult : public ctlSQLGrid
 	wxString CompareSelectCells();
 	wxString AutoColsPlot(int flags,frmQuery *parent);
 	wxString CheckSelColumnDate();
-	wxString CopySelColumnNameType();
+	wxString CopySelColumnNameType(bool onlyname);
 	void ClearFilter();
 	bool IsColText(int col);
 	bool hasRowNumber()