HelpAsSeparateMenuEntry.diff

Zbigniew Rebacz, 12/15/2014 10:09 PM

Download (3.68 KB)

View differences:

ide/ide.h (kopia robocza)
1088 1088
	void      BrowseMenu(Bar& menu);
1089 1089
		void  RescanCode();
1090 1090
		void  QueryId();
1091
		void  About();
1092 1091
		void  OpenTopic(const String& topic, const String& createafter, bool before);
1093 1092
		void  OpenTopic(const String& topic);
1094 1093
		void  OpenATopic();
......
1110 1109
		void  GotoDirDiffRight(int line, DirDiffDlg *df);
1111 1110
		void  DoDirDiff();
1112 1111

  
1112
	void      HelpMenu(Bar& menu);
1113
		void  About();
1113 1114

  
1114 1115
	void      ConsoleMenu(Bar& menu);
1115 1116
		void  ConsoleCopy();
ide/idebar.cpp (kopia robocza)
20 20
	CodeEditor::replace_key = AK_DOREPLACE().key[0];
21 21
}
22 22

  
23
void Ide::PackageMenu(Bar& menu) {
23
void Ide::PackageMenu(Bar& menu)
24
{
24 25
	Project(menu);
25 26
}
26 27

  
27
void Ide::FileBookmark(Bar& menu) {
28
void Ide::FileBookmark(Bar& menu)
29
{
28 30
	int i;
29 31
	for(i = 0; i < 10; i++) {
30 32
		const Bookmark& b = bookmark[i];
......
40 42
		    .Key(K_SHIFT_CTRL_0 + i);
41 43
}
42 44

  
43
void Ide::File(Bar& menu) {
45
void Ide::File(Bar& menu)
46
{
44 47
	menu.Add(AK_SETMAIN, THISBACK(NewMainPackage))
45 48
		.Help("Select global configuration (var), select / add main project package");
46 49

  
......
174 177
		.Help("Locate file by filename (use *, ? when you're not sure)");
175 178
}
176 179

  
177
void Ide::Edit(Bar& menu) {
180
void Ide::Edit(Bar& menu)
181
{
178 182
	if(designer) {
179 183
		if(FileExists(designer->GetFileName())) {
180 184
			menu.Add(AK_EDITASTEXT, THISBACK(EditAsText))
......
327 331
	}
328 332
}
329 333

  
330
void Ide::Setup(Bar& menu) {
334
void Ide::Setup(Bar& menu)
335
{
331 336
	menu.Add("Be verbose", THISBACK(ToggleVerboseBuild))
332 337
		.Check(console.verbosebuild)
333 338
		.Help("Log detailed description of build and debug");
......
366 371
	menu.Add("Synchronize everything..", IdeImg::svn(), THISBACK(SyncSvn));
367 372
}
368 373

  
369
void Ide::Project(Bar& menu) {
374
void Ide::Project(Bar& menu)
375
{
370 376
	if(menu.IsToolBar() && !debugger && !IsEditorMode())
371 377
	{
372 378
		mainconfiglist.Enable(idestate == EDITING);
......
447 453
		.Help("Remove all intermediate files of the current package");
448 454
}
449 455

  
450
void Ide::BuildMenu(Bar& menu) {
456
void Ide::BuildMenu(Bar& menu)
457
{
451 458
	bool b = !IdeIsDebugLock();
452 459
	menu.Add(AK_OUTPUTMODE, THISBACK(SetupOutputMode))
453 460
	    .Help("Setup how to build the target");
......
548 555
	}
549 556
}
550 557

  
551
void Ide::BrowseMenu(Bar& menu) {
558
void Ide::BrowseMenu(Bar& menu)
559
{
552 560
	if (menu.IsMenuBar()) {
553 561
		if(!IsEditorMode()) {
554 562
			menu.AddMenu(AK_NAVIGATOR, IdeImg::Navigator(), THISBACK(ToggleNavigator))
......
576 584
		menu.AddMenu(!designer, AK_JSON, IdeCommonImg::json(), THISBACK(Json));
577 585
		menu.AddMenu(AK_DIRDIFF, DiffImg::DirDiff(), THISBACK(DoDirDiff));
578 586
	}
579
	menu.Separator();
587
}
588

  
589
void Ide::HelpMenu(Bar& menu)
590
{
580 591
	menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
581 592
	menu.Add(AK_SEARCHTOPICS, THISBACK(SearchTopics));
582 593
	menu.Add(AK_BROWSETOPICS_WIN, IdeImg::help_win(), THISBACK(ShowTopicsWin));
594
	if(menu.IsMenuBar())
595
		menu.Separator();
583 596
	menu.Add("About..", THISBACK(About));
584 597
}
585 598

  
586
void Ide::MainMenu(Bar& menu) {
599
void Ide::MainMenu(Bar& menu)
600
{
587 601
	menu.Add("File", THISBACK(File))
588 602
		.Help("Package & file functions, exports, bookmarks");
589 603
	menu.Add("Edit", THISBACK(Edit))
......
603 617
		.Help("Informations, code browsing and assistance");
604 618
	menu.Add("Setup", THISBACK(Setup))
605 619
		.Help("Paths, editor settings, connection to remote host");
620
	menu.Add("Help", THISBACK(HelpMenu))
621
		.Help("Help, credits and license");
606 622
}
607 623

  
608 624
void Ide::MainTool(Bar& bar)
......
624 640
	}
625 641
	Setup(bar);
626 642
	BrowseMenu(bar);
643
	bar.Separator();
644
	HelpMenu(bar);
627 645
}
628 646

  
629 647
void Ide::ConsoleMenu(Bar& menu)