More project stuff

master
Yevgen Muntyan 2008-09-04 01:11:37 -05:00
parent 7c551c099e
commit 7d851b1208
5 changed files with 86 additions and 87 deletions

View File

@ -0,0 +1,11 @@
[Desktop Entry]
_Name=medit
_Comment=Text editor
Exec=medit --project %F
Terminal=false
Type=Application
StartupNotify=true
MimeType=application/x-medit-project;
Icon=medit
Categories=Development;
# Hidden=true

View File

@ -2,9 +2,6 @@
<medit-project version="2.0" type="C" name="moo">
<active>debug</active>
<configurations>
<configuration name="darwin">
<build_dir>build/darwin</build_dir>
</configuration>
<configuration name="debug">
<build_dir>build/debug</build_dir>
<configure>
@ -31,6 +28,9 @@
</configuration>
<configuration name="mingw">
<build_dir>build/mingw</build_dir>
<configure>
<args/>
</configure>
</configuration>
<configuration name="optimized">
<build_dir>build/optimized</build_dir>

View File

@ -61,13 +61,7 @@ packagesdir = $(mimedir)/packages
packages_DATA = medit-mprj.xml
EXTRA_DIST += medit-mprj.xml.in
hicolor = $(datadir)/icons/hicolor
install-data-local:
$(INSTALL_DATA) "$(top_srcdir)/moo/mooutils/pixmaps/medit.png" \
"$(DESTDIR)$(hicolor)/48x48/mimetypes/application-x-medit-project.png"
update_mime = update-mime-database $(DESTDIR)${mimedir}
update_icon_cache = gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
if MOO_ENABLE_GENERATED_FILES
install-data-hook:
@ -82,16 +76,9 @@ install-data-hook:
echo $(update_mime); \
echo "*** "; \
fi
@if echo "Updating icon cache" && $(update_icon_cache); then \
echo "Done."; \
else \
echo "*** GTK icon cache not updated. After install, run this:";\
echo $(update_icon_cache); \
fi
uninstall-hook:
@echo "Updating mime database" && \
echo $(update_mime) && \
$(update_mime) && \
echo "Done."
@if echo "Updating icon cache" && $(update_icon_cache); then echo "Done."; else echo "Failed."; fi
endif

View File

@ -185,7 +185,7 @@ class Dialog(mprj.optdialog.Dialog):
def __init__(self, project):
mprj.optdialog.Dialog.__init__(self, project)
glade_file = os.path.join(os.path.dirname(__file__), 'options.glade')
self.append_page(mprj.simple.ConfigPage(self.config_copy))
# self.append_page(mprj.simple.ConfigPage(self.config_copy))
self.append_page(ConfigsPage('page_configs', self.config_copy, glade_file))
self.append_page(RunOptionsPage('page_run', self.config_copy, glade_file))
self.append_page(BuildCommandsPage('page_commands', self.config_copy, glade_file))

View File

@ -111,17 +111,54 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkLabel" id="label13">
<widget class="GtkEntry" id="config_args">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Environment variables:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config_vars</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="config_build_dir">
<property name="visible">True</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Arguments:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config_args</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Build directory:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config_build_dir</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -153,55 +190,18 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label11">
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Build directory:</property>
<property name="use_markup">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Environment variables:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config_build_dir</property>
<property name="mnemonic_widget">config_vars</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Arguments:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config_args</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="config_build_dir">
<property name="visible">True</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="config_args">
<property name="visible">True</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@ -292,6 +292,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes" comments="Run program from custom directory">Custom:</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">build_dir</property>
@ -358,26 +359,15 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkLabel" id="label3">
<widget class="GtkEntry" id="args">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Arguments:</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Executable:</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@ -393,15 +383,26 @@
</packing>
</child>
<child>
<widget class="GtkEntry" id="args">
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="activates_default">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Executable:</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Arguments:</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>