[Piklab-svn] SF.net SVN: piklab:[2933] trunk/piklab_kde4
IDE for PIC microcontrollers
Brought to you by:
azhyd
Menu
▾
▴
[Piklab-svn] SF.net SVN: piklab:[2933] trunk/piklab_kde4
|
From: <az...@us...> - 2012-07-14 23:38:21
|
Revision: 2933
http://piklab.svn.sourceforge.net/piklab/?rev=2933&view=rev
Author: azhyd
Date: 2012-07-14 23:38:14 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
misc fixes
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/common/gui/global_ui.h
trunk/piklab_kde4/src/common/gui/list_container.cpp
trunk/piklab_kde4/src/common/gui/list_container.h
trunk/piklab_kde4/src/common/gui/misc_gui.cpp
trunk/piklab_kde4/src/data/app_data/hexeditorpartui.rc
trunk/piklab_kde4/src/data/app_data/piklabui.rc
trunk/piklab_kde4/src/libgui/breakpoint_view.cpp
trunk/piklab_kde4/src/libgui/editor_manager.cpp
trunk/piklab_kde4/src/libgui/gui_debug_manager.cpp
trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
trunk/piklab_kde4/src/libgui/project_manager_ui.h
trunk/piklab_kde4/src/libgui/toplevel.cpp
trunk/piklab_kde4/src/libgui/watch_view.cpp
trunk/piklab_kde4/src/libgui/watch_view.h
trunk/piklab_kde4/test/gputils/blinker/blinker.piklab
trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
trunk/piklab_kde4/test/jalv2/test.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/Changelog 2012-07-14 23:38:14 UTC (rev 2933)
@@ -1,9 +1,10 @@
-0.16.2 (12 July 2012)
+0.16.2 (14 July 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
* do not set target power with ICD2 if device nominal vdd is not 5V
-* add menu entry to configure editor
+* add menu entries to configure editor, to toggle/enable breakpoints, to switch editors, and
+ to toggle read-only mode for hex editor
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/common/gui/global_ui.h
===================================================================
--- trunk/piklab_kde4/src/common/gui/global_ui.h 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/common/gui/global_ui.h 2012-07-14 23:38:14 UTC (rev 2933)
@@ -93,7 +93,6 @@
# include <kstandardguiitem.h>
typedef Q3ListViewItem KListViewItem;
-typedef KMenu KPopupMenu;
typedef K3Wizard KWizard;
#endif // NO_KDE
Modified: trunk/piklab_kde4/src/common/gui/list_container.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/list_container.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/common/gui/list_container.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -11,7 +11,7 @@
//----------------------------------------------------------------------------
PopupContainer::PopupContainer(const QString &title, QWidget *parent, const char *name)
- : KPopupMenu(parent)
+ : KMenu(parent)
{
setObjectName(name);
if ( !title.isEmpty() ) addTitle(title);
Modified: trunk/piklab_kde4/src/common/gui/list_container.h
===================================================================
--- trunk/piklab_kde4/src/common/gui/list_container.h 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/common/gui/list_container.h 2012-07-14 23:38:14 UTC (rev 2933)
@@ -23,7 +23,7 @@
};
//----------------------------------------------------------------------------
-class PopupContainer : public KPopupMenu, public ListContainer
+class PopupContainer : public KMenu, public ListContainer
{
Q_OBJECT
public:
Modified: trunk/piklab_kde4/src/common/gui/misc_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/misc_gui.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/common/gui/misc_gui.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -167,7 +167,7 @@
{
_separator = false;
setFlat(true);
- KPopupMenu *popup = new KPopupMenu(this);
+ KMenu *popup = new KMenu(this);
connect(popup, SIGNAL(activated(int)), SIGNAL(activated(int)));
setPopup(popup);
}
Modified: trunk/piklab_kde4/src/data/app_data/hexeditorpartui.rc
===================================================================
--- trunk/piklab_kde4/src/data/app_data/hexeditorpartui.rc 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/data/app_data/hexeditorpartui.rc 2012-07-14 23:38:14 UTC (rev 2933)
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="HexEditorPart" version="1">
+<kpartgui name="HexEditorPart" version="2">
<MenuBar>
- <Menu name="file" noMerge="1"><text>&File</text>
+ <Menu name="file" noMerge="1">
+ <text>&File</text>
<Action name="file_save" group="save_merge" />
<Action name="file_save_as" group="save_merge" />
<Action name="file_reload" group="revert_merge" />
</Menu>
- <Menu name="tools" noMerge="1"><text>&Tools</text>
+ <Menu name="editor" noMerge="1">
+ <text>&Editor</text>
<Action name="tools_toggle_write_lock" group="tools_operations" />
</Menu>
</MenuBar>
-<ToolBar name="mainToolBar" noMerge="1"><text>Main Toolbar</text>
+<ToolBar name="mainToolBar" noMerge="1">
+ <text>Main Toolbar</text>
<Action name="file_save" group="file_operations" />
</ToolBar>
Modified: trunk/piklab_kde4/src/data/app_data/piklabui.rc
===================================================================
--- trunk/piklab_kde4/src/data/app_data/piklabui.rc 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/data/app_data/piklabui.rc 2012-07-14 23:38:14 UTC (rev 2933)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="piklab" version="54">
+<kpartgui name="piklab" version="55">
<MenuBar>
@@ -32,54 +32,24 @@
<Menu name="editor">
<text context="@title:menu">Editor</text>
<Merge/>
- </Menu>
+ </Menu>
+ <Menu name="window">
+ <text context="@title:menu">&Window</text>
+ <Action name="window_history_back"/>
+ <Action name="window_history_forward"/>
+ <Separator/>
+ <Action name="window_tool_views" />
+ <Separator/>
+ <Action name="window_switch_to"/>
+ <Action name="window_switch_source"/>
+ <Action name="window_toggle_breakpoint"/>
+ <Action name="window_enable_breakpoint"/>
+ <Action name="window_show_disassembly_location"/>
+ <Separator/>
+ <Merge/>
+ </Menu>
- <Menu name="window">
- <text context="@title:menu">&Window</text>
- <Action name="new_window"/>
- <Separator/>
- <Action name="add_toolview"/>
- <Action name="select_next_dock"/>
- <Action name="select_previous_dock"/>
- <Action name="docks_submenu"/>
- <Action name="user_interface"/>
- <DefineGroup name="history_operations"/>
- <Action name="history_back"/>
- <Action name="history_forward"/>
- <Separator/>
- <Action name="file_switchto"/>
- <Separator/>
- <DefineGroup name="error_operations"/>
- <Separator/>
- <Merge/>
- <Separator/>
- <DefineGroup name="view_operations"/>
-
- <Action name="view_next_window"/>
- <Action name="view_previous_window"/>
- <Separator/>
- <Action name="split_horizontal"/>
- <Action name="split_vertical"/>
- <Separator/>
- <Action name="fullscreen"/>
- <Separator/>
- <DefineGroup name="window_operations"/>
- <Separator/>
- <Action name="focus_editor"/>
- <Separator/>
- <Action name="show_left_dock"/>
- <Action name="show_right_dock"/>
- <Action name="show_bottom_dock"/>
- <Action name="hide_all_docks"/>
- <Separator/>
- <Action name="view_tool_views" />
- <Action name="view_switch_source"/>
- <Action name="show_disassembly_location"/>
- <Separator/>
- <Merge/>
- </Menu>
-
<Merge/>
<Menu name="project"><text>&Project</text>
Modified: trunk/piklab_kde4/src/libgui/breakpoint_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/breakpoint_view.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/breakpoint_view.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -17,12 +17,12 @@
//----------------------------------------------------------------------------
void Breakpoint::updateActions(const Data *data)
{
- bool hasBreakpoint = (data ? Breakpoint::list().contains(*data) : false);
- Main::action("toggle_breakpoint")->setText(hasBreakpoint ? i18n("Remove breakpoint") : i18n("Set breakpoint"));
- Main::action("toggle_breakpoint")->setEnabled(data);
- bool isActive = (hasBreakpoint ? Breakpoint::list().state(*data)==Breakpoint::Active : false);
- Main::action("enable_breakpoint")->setText(!isActive ? i18n("Enable breakpoint") : i18n("Disable breakpoint"));
- Main::action("enable_breakpoint")->setEnabled(Debugger::manager->coff() && hasBreakpoint);
+ const bool hasBreakpoint = (data ? Breakpoint::list().contains(*data) : false);
+ Main::action("window_toggle_breakpoint")->setText(hasBreakpoint ? i18n("Remove breakpoint") : i18n("Set breakpoint"));
+ Main::action("window_toggle_breakpoint")->setEnabled(data);
+ const bool isActive = (hasBreakpoint ? Breakpoint::list().state(*data)==Breakpoint::Active : false);
+ Main::action("window_enable_breakpoint")->setText(!isActive ? i18n("Enable breakpoint") : i18n("Disable breakpoint"));
+ Main::action("window_enable_breakpoint")->setEnabled(Debugger::manager->coff() && hasBreakpoint);
}
//----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -392,7 +392,7 @@
Editor *editor = static_cast<Editor *>(page(i));
if ( editor==0 ) return;
- std::auto_ptr<KPopupMenu> popup(new KPopupMenu);
+ std::auto_ptr<KMenu> popup(new KMenu);
popup->addTitle(title(*editor));
QAction* close = popup->addAction(KIcon("document-close"), i18n("Close"));
QAction* closeAllOthers = nbEditors()>1 ? popup->addAction(KIcon("document-close"), i18n("Close All Others")) : NULL;
Modified: trunk/piklab_kde4/src/libgui/gui_debug_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/gui_debug_manager.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/gui_debug_manager.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -116,6 +116,8 @@
Breakpoint::list().append(data);
Breakpoint::list().setAddress(data, address);
if (_coff != NULL) toggleEnableBreakpoint();
+ Editor* editor = Main::currentEditor();
+ if (editor != NULL) editor->statusChanged();
}
void Debugger::GuiManager::toggleEnableBreakpoint()
Modified: trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager_ui.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/project_manager_ui.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -22,7 +22,7 @@
void PopupMenu::insertItem(const QString &icon, const QString &label, QObject *receiver, const char *slot)
{
QPixmap pixmap = IconLoader::loadIcon(icon, IconLoader::Small);
- KPopupMenu::insertItem(pixmap, label, receiver, slot, 0, _index);
+ KMenu::insertItem(pixmap, label, receiver, slot, 0, _index);
_index++;
}
Modified: trunk/piklab_kde4/src/libgui/project_manager_ui.h
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager_ui.h 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/project_manager_ui.h 2012-07-14 23:38:14 UTC (rev 2933)
@@ -20,7 +20,7 @@
#include "progs/list/prog_list.h"
//-----------------------------------------------------------------------------
-class PopupMenu : public KPopupMenu
+class PopupMenu : public KMenu
{
Q_OBJECT
public:
@@ -130,7 +130,7 @@
private:
mutable std::auto_ptr<QComboBox> _combo;
-
+
virtual QWidget *editWidgetFactory(int) const;
virtual bool alwaysAcceptEdit(int) const { return true; }
};
Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -186,26 +186,24 @@
a->setIcon(KIcon("window-close"));
actionCollection()->addAction(KStandardAction::Quit, this, SLOT(close()));
- // edit actions
-
- // view actions
- a = actionCollection()->addAction("history_back", Main::_editorManager, SLOT(goBack()));
+ // window actions
+ a = actionCollection()->addAction("window_history_back", Main::_editorManager, SLOT(goBack()));
KGuiItem guiItem = KStandardGuiItem::back();
a->setText(guiItem.text());
a->setIcon(guiItem.icon());
- a = actionCollection()->addAction("history_forward", Main::_editorManager, SLOT(goForward()));
+ a = actionCollection()->addAction("window_history_forward", Main::_editorManager, SLOT(goForward()));
guiItem = KStandardGuiItem::forward();
a->setText(guiItem.text());
a->setIcon(guiItem.icon());
- a = actionCollection()->addAction("view_switch_to", Main::_editorManager, SLOT(switchToEditor()));
+ a = actionCollection()->addAction("window_switch_to", Main::_editorManager, SLOT(switchToEditor()));
a->setText(i18n("Switch to..."));
a->setShortcut(Qt::CTRL + Qt::Key_Slash);
- a = actionCollection()->addAction("view_switch_source", Main::_editorManager, SLOT(switchHeaderImplementation()));
+ a = actionCollection()->addAction("window_switch_source", Main::_editorManager, SLOT(switchHeaderImplementation()));
a->setText(i18n("Switch Header/Implementation"));
a->setShortcut(Qt::SHIFT + Qt::Key_F12);
- actionCollection()->addAction("toggle_breakpoint", Debugger::manager, SLOT(toggleBreakpoint()));
- actionCollection()->addAction("enable_breakpoint", Debugger::manager, SLOT(toggleEnableBreakpoint()));
- a = actionCollection()->addAction("show_disassembly_location", Debugger::manager, SLOT(showDisassemblyLocation()));
+ actionCollection()->addAction("window_toggle_breakpoint", Debugger::manager, SLOT(toggleBreakpoint()));
+ actionCollection()->addAction("window_enable_breakpoint", Debugger::manager, SLOT(toggleEnableBreakpoint()));
+ a = actionCollection()->addAction("window_show_disassembly_location", Debugger::manager, SLOT(showDisassemblyLocation()));
a->setText(i18n("Show disassembly location"));
// project actions
@@ -589,10 +587,10 @@
const PURL::FileType currentType = (Main::currentEditor() != NULL ? Main::currentEditor()->fileType() : PURL::Nb_FileTypes);
const bool isSource = (currentType==PURL::Nb_FileTypes ? false : currentType.data().group==PURL::Source);
const bool isHeader = (currentType==PURL::Nb_FileTypes ? false : currentType.data().group==PURL::Header);
- Main::action("view_switch_source")->setEnabled(isSource || isHeader);
- Main::action("history_back")->setEnabled(Main::editorManager().history().hasBack());
- Main::action("history_forward")->setEnabled(Main::editorManager().history().hasForward());
- Main::action("show_disassembly_location")->setEnabled(Debugger::manager->coff()!=0 && (isSource || isHeader));
+ Main::action("window_switch_source")->setEnabled(isSource || isHeader);
+ Main::action("window_history_back")->setEnabled(Main::editorManager().history().hasBack());
+ Main::action("window_history_forward")->setEnabled(Main::editorManager().history().hasForward());
+ Main::action("window_show_disassembly_location")->setEnabled(Debugger::manager->coff()!=0 && (isSource || isHeader));
// update project
Modified: trunk/piklab_kde4/src/libgui/watch_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/watch_view.cpp 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/watch_view.cpp 2012-07-14 23:38:14 UTC (rev 2933)
@@ -86,10 +86,10 @@
_root->setOpen(true);
}
-KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *parent, uint offset)
+KMenu* Register::WatchedListView::appendFormatMenu(KMenu* parent, uint offset)
{
QPixmap icon = IconLoader::loadIcon("fonts", IconLoader::Small);
- KPopupMenu *popup = new KPopupMenu;
+ KMenu* popup = new KMenu;
popup->addTitle(i18n("Format"));
FOR_EACH(NumberBase, base) popup->insertItem(base.label(), offset + base.type());
parent->insertItem(icon, i18n("Format"), popup);
@@ -169,9 +169,9 @@
} else {
if ( item->rtti()==Register::PortBitRtti ) return;
Register::ListViewItem *ritem = static_cast<ListViewItem *>(item);
- std::auto_ptr<KPopupMenu> pop(new KPopupMenu);
+ std::auto_ptr<KMenu> pop(new KMenu);
pop->addTitle(ritem->label());
- KPopupMenu *fpop = appendFormatMenu(pop.get(), 0);
+ KMenu* fpop = appendFormatMenu(pop.get(), 0);
FOR_EACH(NumberBase, base) fpop->setItemChecked(base.type(), ritem->base()==base);
pop->insertSeparator();
QPixmap icon = IconLoader::loadIcon("edit-rename", IconLoader::Small);
Modified: trunk/piklab_kde4/src/libgui/watch_view.h
===================================================================
--- trunk/piklab_kde4/src/libgui/watch_view.h 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/src/libgui/watch_view.h 2012-07-14 23:38:14 UTC (rev 2933)
@@ -65,11 +65,11 @@
virtual void contextMenu(Q3ListViewItem *item, const QPoint &p, int col);
private:
- PopupContainer *_popup;
- KPopupMenu *_formatPopup;
- NumberBase _base;
+ PopupContainer* _popup;
+ KMenu* _formatPopup;
+ NumberBase _base;
- static KPopupMenu *appendFormatMenu(KPopupMenu *parent, uint offset);
+ static KMenu* appendFormatMenu(KMenu* parent, uint offset);
};
//-----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/test/gputils/blinker/blinker.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker/blinker.piklab 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/test/gputils/blinker/blinker.piklab 2012-07-14 23:38:14 UTC (rev 2933)
@@ -11,10 +11,7 @@
<custom_linker_script/>
<is_library>true</is_library>
<output_type>executable</output_type>
- <programmer>direct</programmer>
- <opened_files>
- <item>blinker.asm</item>
- </opened_files>
+ <programmer>gpsim</programmer>
</general>
<assembler>
<warning_level>0</warning_level>
Modified: trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-07-14 23:38:14 UTC (rev 2933)
@@ -11,7 +11,13 @@
<description/>
<version>0.1</version>
<tool>gputils</tool>
- <programmer>gpsim</programmer>
+ <programmer>icd2</programmer>
+ <opened_files>
+ <item>blinker_18.asm</item>
+ </opened_files>
+ <watched_registers>
+ <item>4034 2 </item>
+ </watched_registers>
</general>
<assembler>
<custom_options/>
Modified: trunk/piklab_kde4/test/jalv2/test.piklab
===================================================================
--- trunk/piklab_kde4/test/jalv2/test.piklab 2012-07-14 18:50:09 UTC (rev 2932)
+++ trunk/piklab_kde4/test/jalv2/test.piklab 2012-07-14 23:38:14 UTC (rev 2933)
@@ -7,6 +7,9 @@
<files>
<item>test.jal</item>
</files>
+ <opened_files>
+ <item>test.jal</item>
+ </opened_files>
</general>
<editors/>
</piklab>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
