marrub
/
Maraiah
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tycho: add close button

master
an 2019-06-15 21:27:28 -04:00
parent 840ac231d3
commit 3c42cd451d
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/tycho/cc_headers/menu.h
View File

@ -33,7 +33,7 @@ protected:
private:
ProjectView *activeProject() const;
QMdiSubWindow *activeSubWindow() const;
void addProject(ProjectView *proj);
void addProject(ProjectView *view);
QSharedPointer<Ui::Menu> ui;
};

8
source/tycho/cc_source/menu.cc
View File

@ -17,11 +17,12 @@ Menu::Menu(QWidget *parent) :
{
ui->setupUi(this);
ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
ui->actionAbout->setShortcut(QKeySequence(QKeySequence::HelpContents));
ui->actionClose->setShortcut(QKeySequence(QKeySequence::Close));
ui->actionMapProps->setShortcut(QKeySequence(tr("Ctrl+P")));
ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
dbgPrintFunc();
}
@ -110,6 +111,7 @@ void Menu::updateActions()
auto view = activeProject();
bool active = view != nullptr;
ui->actionClose->setEnabled(active);
ui->actionMapProps->setEnabled(active);
dbgPrintFunc();

29
source/tycho/ui/menu.ui
View File

@ -61,6 +61,8 @@
<addaction name="actionNew"/>
<addaction name="actionOpen"/>
<addaction name="separator"/>
<addaction name="actionClose"/>
<addaction name="separator"/>
<addaction name="actionQuit"/>
</widget>
<widget class="QMenu" name="menuEdit">
@ -128,6 +130,17 @@
<string>&amp;About Tycho</string>
</property>
</action>
<action name="actionClose">
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="window-close"/>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
@ -230,6 +243,22 @@
</hint>
</hints>
</connection>
<connection>
<sender>actionClose</sender>
<signal>triggered()</signal>
<receiver>mdiArea</receiver>
<slot>closeActiveSubWindow()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>301</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>openMapProperties()</slot>