github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Cut/Copy icons properly enabled #627

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6819 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-27 13:33:56 +00:00
parent b15b5fbc5b
commit 32db7f3f38
3 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/ide/ide.h
View file

@ -1061,7 +1061,9 @@ public:
void ResolveUvsConflict();
void SetBar();
void SetMenuBar();
void SetToolBar();
void UpdateFormat(CodeEditor& editor);
void UpdateFormat();
void ReadHlStyles(ArrayCtrl& hlstyle);

65
uppsrc/ide/idebar.cpp
View file

@ -165,6 +165,8 @@ void Ide::Edit(Bar& menu) {
designer->EditMenu(menu);
}
else {
String selection = editor.GetSelection();
if(GetFileExt(editfile) == ".t") {
if(editastext.Find(editfile) >= 0)
menu.Add(AK_DESIGNER, THISBACK(EditUsingDesigner))
@ -184,17 +186,21 @@ void Ide::Edit(Bar& menu) {
if(toolbar_in_row) add = &MenuBar::AddMenu;
(menu.*add)("Undo", CtrlImg::undo(), callback(&editor, &LineEdit::Undo))
.Key(K_CTRL_Z)
.Enable(editor.IsUndo())
.Help("Undo changes to text");
(menu.*add)("Redo", CtrlImg::redo(), callback(&editor, &LineEdit::Redo))
.Key(K_SHIFT|K_CTRL_Z)
.Enable(editor.IsRedo())
.Help("Redo undone changes");
if(!toolbar_in_row || menu.IsMenuBar())
menu.Separator();
(menu.*add)("Cut", CtrlImg::cut(), callback(&editor, &LineEdit::Cut))
.Key(K_CTRL_X)
.Enable(!selection.IsEmpty())
.Help("Cut selection and place it on the system clipboard");
(menu.*add)("Copy", CtrlImg::copy(), callback(&editor, &LineEdit::Copy))
.Key(K_CTRL_C)
.Enable(!selection.IsEmpty())
.Help("Copy current selection on the system clipboard");
(menu.*add)("Paste", CtrlImg::paste(), THISBACK(EditPaste))
.Key(K_CTRL_V)
@ -511,30 +517,32 @@ void Ide::DebugMenu(Bar& menu)
}
void Ide::BrowseMenu(Bar& menu) {
menu.AddMenu(AK_NAVIGATOR, IdeImg::Navigator(), THISBACK(ToggleNavigator))
.Check(editor.IsNavigator());
menu.Add(AK_SEARCHCODE, THISBACK(SearchCode));
menu.Add(!designer, AK_GOTO, THISBACK(Goto));
menu.Add(AK_GOTOGLOBAL, THISBACK(GotoGlobal));
menu.Add(!designer, AK_JUMPS, THISBACK(ContextGoto));
menu.Add(!designer, AK_SWAPS, THISBACK(SwapS));
menu.Add(!designer, AK_ASSIST, callback(&editor, &AssistEditor::Assist));
menu.Add(!designer, AK_DCOPY, callback(&editor, &AssistEditor::DCopy));
menu.Add(!designer, AK_VIRTUALS, callback(&editor, &AssistEditor::Virtuals));
menu.Add(!designer, AK_THISBACKS, callback(&editor, &AssistEditor::Thisbacks));
menu.Add(!designer, AK_COMPLETE, callback(&editor, &AssistEditor::Complete));
menu.Add(!designer, AK_COMPLETE2, callback(&editor, &AssistEditor::Complete2));
menu.Add(!designer, AK_ABBR, callback(&editor, &AssistEditor::Abbr));
menu.Add(!designer, "Insert", THISBACK(InsertMenu));
menu.MenuSeparator();
menu.Add("Rescan code", THISBACK(RescanCode));
menu.MenuSeparator();
menu.AddMenu(AK_CALC, IdeImg::calc(), THISBACK1(ToggleBottom, BCALC))
if (menu.IsMenuBar()) {
menu.AddMenu(AK_NAVIGATOR, IdeImg::Navigator(), THISBACK(ToggleNavigator))
.Check(editor.IsNavigator());
menu.Add(AK_SEARCHCODE, THISBACK(SearchCode));
menu.Add(!designer, AK_GOTO, THISBACK(Goto));
menu.Add(AK_GOTOGLOBAL, THISBACK(GotoGlobal));
menu.Add(!designer, AK_JUMPS, THISBACK(ContextGoto));
menu.Add(!designer, AK_SWAPS, THISBACK(SwapS));
menu.Add(!designer, AK_ASSIST, callback(&editor, &AssistEditor::Assist));
menu.Add(!designer, AK_DCOPY, callback(&editor, &AssistEditor::DCopy));
menu.Add(!designer, AK_VIRTUALS, callback(&editor, &AssistEditor::Virtuals));
menu.Add(!designer, AK_THISBACKS, callback(&editor, &AssistEditor::Thisbacks));
menu.Add(!designer, AK_COMPLETE, callback(&editor, &AssistEditor::Complete));
menu.Add(!designer, AK_COMPLETE2, callback(&editor, &AssistEditor::Complete2));
menu.Add(!designer, AK_ABBR, callback(&editor, &AssistEditor::Abbr));
menu.Add(!designer, "Insert", THISBACK(InsertMenu));
menu.MenuSeparator();
menu.Add("Rescan code", THISBACK(RescanCode));
menu.MenuSeparator();
menu.AddMenu(AK_CALC, IdeImg::calc(), THISBACK1(ToggleBottom, BCALC))
.Check(IsBottomShown() && btabs.GetCursor() == BCALC);
menu.AddMenu(AK_QTF, IdeCommonImg::Qtf(), THISBACK(Qtf));
menu.AddMenu(!designer, AK_XML, IdeCommonImg::xml(), THISBACK(Xml));
menu.AddMenu(!designer, AK_JSON, IdeCommonImg::json(), THISBACK(Json));
menu.MenuSeparator();
menu.AddMenu(AK_QTF, IdeCommonImg::Qtf(), THISBACK(Qtf));
menu.AddMenu(!designer, AK_XML, IdeCommonImg::xml(), THISBACK(Xml));
menu.AddMenu(!designer, AK_JSON, IdeCommonImg::json(), THISBACK(Json));
}
menu.Separator();
menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
menu.Add(AK_SEARCHTOPICS, THISBACK(SearchTopics));
menu.Add("About..", THISBACK(About));
@ -572,6 +580,7 @@ void Ide::MainTool(Bar& bar)
bar.Separator();
Project(bar);
BuildMenu(bar);
if(!debugger) {
bar.Separator();
DebugMenu(bar);
@ -597,7 +606,17 @@ void Ide::ConsoleMenu(Bar& menu)
}
void Ide::SetBar()
{
SetMenuBar();
SetToolBar();
}
void Ide::SetMenuBar()
{
menubar.Set(THISBACK(MainMenu));
}
void Ide::SetToolBar()
{
toolbar.Set(THISBACK(MainTool));
}

3
uppsrc/ide/idewin.cpp
View file

@ -306,7 +306,8 @@ void Ide::SetupBars()
Ide::Ide()
{
editor.theide = this;
editor.WhenSel = THISBACK(SetToolBar);
start_time = GetSysTime();
stat_build_time = 0;
build_start_time = Null;