From ee26be273f4f7c1eff2efa4d50b8b154438b8b48 Mon Sep 17 00:00:00 2001 From: dpage Date: Tue, 5 May 2009 11:14:04 +0000 Subject: [PATCH] Fix the tooltips on the debugger toolbar, and adjust the default perspective to ensure there's enough room for the buttons on GTK. [Ashesh Vashi] git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7843 a7884b65-44f6-0310-8a51-81a127f17b15 --- pgadmin/debugger/frmDebugger.cpp | 12 ++++++------ pgadmin/include/debugger/frmDebugger.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pgadmin/debugger/frmDebugger.cpp b/pgadmin/debugger/frmDebugger.cpp index a9ad7bfd3..83e0ea9c3 100644 --- a/pgadmin/debugger/frmDebugger.cpp +++ b/pgadmin/debugger/frmDebugger.cpp @@ -256,14 +256,14 @@ ctlMenuToolbar * frmDebugger::setupToolBar( void ) m_toolBar->SetToolBitmapSize( wxSize( 16, 16 )); - m_toolBar->AddTool( MENU_ID_STEP_INTO, _( "Step into" ), wxBitmap(stepInto_xpm)); - m_toolBar->AddTool( MENU_ID_STEP_OVER, _( "Step over" ), wxBitmap(stepOver_xpm)); - m_toolBar->AddTool( MENU_ID_CONTINUE, _( "Continue" ), wxBitmap(continue_xpm)); + m_toolBar->AddTool( MENU_ID_STEP_INTO, _( "Step into" ), wxBitmap(stepInto_xpm), _( "Step into" )); + m_toolBar->AddTool( MENU_ID_STEP_OVER, _( "Step over" ), wxBitmap(stepOver_xpm), _( "Step over" )); + m_toolBar->AddTool( MENU_ID_CONTINUE, _( "Continue" ), wxBitmap(continue_xpm), _( "Continue" )); m_toolBar->AddSeparator(); - m_toolBar->AddTool( MENU_ID_TOGGLE_BREAK, _( "Toggle breakpoint" ), wxBitmap(setBreak_xpm)); - m_toolBar->AddTool( MENU_ID_CLEAR_ALL_BREAK, _( "Clear all breakpoints" ), wxBitmap(clearAll_xpm)); + m_toolBar->AddTool( MENU_ID_TOGGLE_BREAK, _( "Toggle breakpoint" ), wxBitmap(setBreak_xpm), _( "Toggle breakpoint" )); + m_toolBar->AddTool( MENU_ID_CLEAR_ALL_BREAK, _( "Clear all breakpoints" ), wxBitmap(clearAll_xpm), _( "Clear all breakpoints" )); m_toolBar->AddSeparator(); - m_toolBar->AddTool( MENU_ID_STOP, _( "Stop debugging" ), wxBitmap(stop_xpm)); + m_toolBar->AddTool( MENU_ID_STOP, _( "Stop debugging" ), wxBitmap(stop_xpm), _( "Stop debugging" )); m_toolBar->EnableTool(MENU_ID_STEP_INTO, false); m_toolBar->EnableTool(MENU_ID_STEP_OVER, false); diff --git a/pgadmin/include/debugger/frmDebugger.h b/pgadmin/include/debugger/frmDebugger.h index 5d5bd3d5d..6dc94079f 100644 --- a/pgadmin/include/debugger/frmDebugger.h +++ b/pgadmin/include/debugger/frmDebugger.h @@ -36,7 +36,7 @@ #define FRMDEBUGGER_DEFAULT_PERSPECTIVE wxT("layout2|name=toolBar;caption=Toolbar;state=2108144;dir=1;layer=10;row=0;pos=1;prop=100000;bestw=154;besth=23;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=sourcePane;caption=Source pane;state=1020;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=350;besth=200;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=stackPane;caption=Stack pane;state=2099196;dir=2;layer=0;row=0;pos=0;prop=100000;bestw=250;besth=200;minw=100;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=outputPane;caption=Output pane;state=2099196;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=550;besth=300;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=25|dock_size(5,0,0)=237|dock_size(2,0,0)=237|dock_size(3,0,0)=156|") #else #ifdef __WXGTK__ -#define FRMDEBUGGER_DEFAULT_PERSPECTIVE wxT("layout2|name=toolBar;caption=Toolbar;state=2108144;dir=1;layer=10;row=0;pos=1;prop=100000;bestw=195;besth=30;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=sourcePane;caption=Source pane;state=1020;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=350;besth=200;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=stackPane;caption=Stack pane;state=2099196;dir=2;layer=0;row=0;pos=0;prop=100000;bestw=250;besth=200;minw=100;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=outputPane;caption=Output pane;state=2099196;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=550;besth=300;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=25|dock_size(5,0,0)=237|dock_size(2,0,0)=237|dock_size(3,0,0)=156|") +#define FRMDEBUGGER_DEFAULT_PERSPECTIVE wxT("layout2|name=toolBar;caption=Toolbar;state=2108144;dir=1;layer=10;row=0;pos=1;prop=100000;bestw=205;besth=30;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=sourcePane;caption=Source pane;state=1020;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=350;besth=200;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=stackPane;caption=Stack pane;state=2099196;dir=2;layer=0;row=0;pos=0;prop=100000;bestw=250;besth=200;minw=100;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=outputPane;caption=Output pane;state=2099196;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=550;besth=300;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=25|dock_size(5,0,0)=237|dock_size(2,0,0)=237|dock_size(3,0,0)=156|") #else #define FRMDEBUGGER_DEFAULT_PERSPECTIVE wxT("layout2|name=toolBar;caption=Toolbar;state=2108144;dir=1;layer=10;row=0;pos=1;prop=100000;bestw=154;besth=23;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=sourcePane;caption=Source pane;state=1020;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=350;besth=200;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=stackPane;caption=Stack pane;state=2099196;dir=2;layer=0;row=0;pos=0;prop=100000;bestw=250;besth=200;minw=100;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=outputPane;caption=Output pane;state=2099196;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=550;besth=300;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=25|dock_size(5,0,0)=237|dock_size(2,0,0)=237|dock_size(3,0,0)=156|") #endif -- 2.39.5