Permalink
Browse files

:H, Act in dev...

  • Loading branch information...
1 parent bbcdc02 commit d8f99817aa73355879b3cfd64f40ebe845c98c90 @nycholas committed Aug 4, 2010
Showing with 4,854 additions and 41 deletions.
  1. +1 −1 Makefile
  2. +1 −1 share/Makefile
  3. +1 −1 share/c-project/Makefile.static
  4. +1 −1 share/c-project/translations/Makefile
  5. +1 −1 src/Makefile
  6. +246 −10 src/app/Makefile
  7. +1 −0 src/app/app.pro
  8. +0 −6 src/app/main.cpp
  9. +1 −1 src/core/Makefile
  10. +24 −0 src/core/mainwindow.cpp
  11. +3 −0 src/core/mainwindow.h
  12. +16 −6 src/core/widgets/mainwindow.ui
  13. +54 −11 src/modules/Makefile
  14. +95 −0 src/modules/act/Makefile
  15. +371 −0 src/modules/act/act.cpp
  16. +106 −0 src/modules/act/act.h
  17. +42 −0 src/modules/act/act.pri
  18. +6 −0 src/modules/act/act.pro
  19. +289 −0 src/modules/act/actform.cpp
  20. +92 −0 src/modules/act/actform.h
  21. +109 −0 src/modules/act/actsearch.cpp
  22. +72 −0 src/modules/act/actsearch.h
  23. +371 −0 src/modules/act/coupon.cpp
  24. +106 −0 src/modules/act/coupon.h
  25. +289 −0 src/modules/act/couponform.cpp
  26. +92 −0 src/modules/act/couponform.h
  27. +109 −0 src/modules/act/couponsearch.cpp
  28. +72 −0 src/modules/act/couponsearch.h
  29. +232 −0 src/modules/act/models/actmodel.cpp
  30. +93 −0 src/modules/act/models/actmodel.h
  31. +232 −0 src/modules/act/models/couponmodel.cpp
  32. +93 −0 src/modules/act/models/couponmodel.h
  33. +301 −0 src/modules/act/widgets/act.ui
  34. +243 −0 src/modules/act/widgets/actform.ui
  35. +239 −0 src/modules/act/widgets/actsearch.ui
  36. +301 −0 src/modules/act/widgets/coupon.ui
  37. +243 −0 src/modules/act/widgets/couponform.ui
  38. +239 −0 src/modules/act/widgets/couponsearch.ui
  39. +53 −0 src/modules/act/widgets/resources.qrc
  40. BIN src/modules/act/widgets/static/default/icons/22x22/application-exit.png
  41. BIN src/modules/act/widgets/static/default/icons/22x22/configure.png
  42. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-cancel.png
  43. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-error.png
  44. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-information.png
  45. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-ok-apply.png
  46. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-ok.png
  47. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-password.png
  48. BIN src/modules/act/widgets/static/default/icons/22x22/dialog-warning.png
  49. BIN src/modules/act/widgets/static/default/icons/22x22/document-new.png
  50. BIN src/modules/act/widgets/static/default/icons/22x22/document-open-recent.png
  51. BIN src/modules/act/widgets/static/default/icons/22x22/document-open-remote.png
  52. BIN src/modules/act/widgets/static/default/icons/22x22/document-open.png
  53. BIN src/modules/act/widgets/static/default/icons/22x22/document-print.png
  54. BIN src/modules/act/widgets/static/default/icons/22x22/document-save-all.png
  55. BIN src/modules/act/widgets/static/default/icons/22x22/document-save-as.png
  56. BIN src/modules/act/widgets/static/default/icons/22x22/document-save.png
  57. BIN src/modules/act/widgets/static/default/icons/22x22/documentation.png
  58. BIN src/modules/act/widgets/static/default/icons/22x22/edit-copy.png
  59. BIN src/modules/act/widgets/static/default/icons/22x22/edit-cut.png
  60. BIN src/modules/act/widgets/static/default/icons/22x22/edit-delete.png
  61. BIN src/modules/act/widgets/static/default/icons/22x22/edit-paste.png
  62. BIN src/modules/act/widgets/static/default/icons/22x22/edit-redo.png
  63. BIN src/modules/act/widgets/static/default/icons/22x22/edit-undo.png
  64. BIN src/modules/act/widgets/static/default/icons/22x22/face-devilish.png
  65. BIN src/modules/act/widgets/static/default/icons/22x22/go-next-view.png
  66. BIN src/modules/act/widgets/static/default/icons/22x22/go-next.png
  67. BIN src/modules/act/widgets/static/default/icons/22x22/go-previous-view.png
  68. BIN src/modules/act/widgets/static/default/icons/22x22/go-previous.png
  69. BIN src/modules/act/widgets/static/default/icons/22x22/help-about.png
  70. BIN src/modules/act/widgets/static/default/icons/22x22/help-contents.png
  71. BIN src/modules/act/widgets/static/default/icons/22x22/im-status-message-edit.png
  72. BIN src/modules/act/widgets/static/default/icons/22x22/irc-operator.png
  73. BIN src/modules/act/widgets/static/default/icons/22x22/list-add-user.png
  74. BIN src/modules/act/widgets/static/default/icons/22x22/meeting-organizer.png
  75. BIN src/modules/act/widgets/static/default/icons/22x22/page-zoom.png
  76. BIN src/modules/act/widgets/static/default/icons/22x22/preferences-desktop.png
  77. BIN src/modules/act/widgets/static/default/icons/22x22/project-open.png
  78. BIN src/modules/act/widgets/static/default/icons/22x22/resource-group.png
  79. BIN src/modules/act/widgets/static/default/icons/22x22/system-log-out.png
  80. BIN src/modules/act/widgets/static/default/icons/22x22/system-shutdown.png
  81. BIN src/modules/act/widgets/static/default/icons/22x22/tools-report-bug.png
  82. BIN src/modules/act/widgets/static/default/icons/22x22/video-display.png
  83. BIN src/modules/act/widgets/static/default/icons/22x22/view-fullscreen.png
  84. BIN src/modules/act/widgets/static/default/icons/22x22/view-left-close.png
  85. BIN src/modules/act/widgets/static/default/icons/22x22/view-left-new.png
  86. BIN src/modules/act/widgets/static/default/icons/22x22/view-refresh.png
  87. BIN src/modules/act/widgets/static/default/icons/22x22/view-restore.png
  88. BIN src/modules/act/widgets/static/default/icons/22x22/window-close.png
  89. BIN src/modules/act/widgets/static/default/icons/32x32/meeting-organizer.png
  90. +10 −0 src/modules/modules.pri
  91. +4 −2 src/modules/modules.pro
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: c-project
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
# Project: c-project.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile c-project.pro
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: share
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
# Project: share.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile share.pro
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: phony_target
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
# Project: static.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile.static static.pro
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: phony_target2
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
# Project: translations.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile translations.pro
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: src
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:48 2010
# Project: src.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile src.pro
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,5 +1,6 @@
include(../../c-project.pri)
include(../core/core.pri)
+include(../modules/modules.pri)
TEMPLATE = app
TARGET = $$IDE_APP_TARGET
View
@@ -31,15 +31,9 @@
#include <QtCore/QCoreApplication>
#include <QtGui/QApplication>
-<<<<<<< HEAD:src/app/main.cpp
#include "shared/database/connection.h"
#include "core/mainwindow.h"
#include "core/login.h"
-=======
-#include "persistence/connection.h"
-#include "form/mainwindow.h"
-#include "form/login.h"
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:main.cpp
int main(int argc, char *argv[]) {
qDebug() << "** Init application **";
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: core
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:48 2010
# Project: core.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile core.pro
View
@@ -117,6 +117,8 @@ void MainWindow::createActions(void) {
permissionsAction()));
connect(actionGroups, SIGNAL(triggered()), this, SLOT(groupsAction()));
connect(actionUsers, SIGNAL(triggered()), this, SLOT(usersAction()));
+
+ connect(actionCoupon, SIGNAL(triggered()), this, SLOT(couponAction()));
}
void MainWindow::updateWidgets(void) {
@@ -227,3 +229,25 @@ void MainWindow::usersAction(void) {
mdi->showMaximized();
}
+
+void MainWindow::couponAction(void) {
+ qDebug() << "In MainWindow::couponAction()";
+ QIcon icon;
+ icon.addFile(QString::fromUtf8(
+ ":/default/static/default/icons/22x22/face-devilish.png"), QSize(),
+ QIcon::Normal, QIcon::Off);
+
+ Coupon *window = new Coupon(this);
+ if (window->objectName().isEmpty())
+ window->setObjectName(QString::fromUtf8("Coupon"));
+ window->setWindowIcon(icon);
+
+ QMdiSubWindow *mdi = new QMdiSubWindow();
+ mdi->setWidget(window);
+ mdi->setAttribute(Qt::WA_DeleteOnClose);
+ mdi->setWindowIcon(icon);
+
+ mdiArea->addSubWindow(mdi);
+
+ mdi->showMaximized();
+}
View
@@ -37,6 +37,7 @@
#include "permission.h"
#include "group.h"
#include "user.h"
+#include "modules/act/coupon.h"
#include <QtCore/QSettings>
#include <QtGui/QCloseEvent>
@@ -61,6 +62,8 @@ private slots:
void groupsAction(void);
void usersAction(void);
+ void couponAction(void);
+
private:
void isAuthentic(void);
void readSettings(void);
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>670</width>
- <height>491</height>
+ <width>669</width>
+ <height>476</height>
</rect>
</property>
<property name="windowTitle">
@@ -141,7 +141,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>670</width>
+ <width>669</width>
<height>25</height>
</rect>
</property>
@@ -198,11 +198,17 @@
<addaction name="actionPermissions"/>
<addaction name="actionGroups"/>
<addaction name="actionUsers"/>
- <addaction name="actionAtos"/>
+ </widget>
+ <widget class="QMenu" name="menuAct">
+ <property name="title">
+ <string>&amp;Act</string>
+ </property>
+ <addaction name="actionCoupon"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuAdmin"/>
+ <addaction name="menuAct"/>
<addaction name="menuWindow"/>
<addaction name="menuHelp"/>
</widget>
@@ -486,9 +492,13 @@
<string>&amp;Users</string>
</property>
</action>
- <action name="actionAtos">
+ <action name="actionCoupon">
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/default/static/default/icons/22x22/document-open-recent.png</normaloff>:/default/static/default/icons/22x22/document-open-recent.png</iconset>
+ </property>
<property name="text">
- <string>A&amp;tos</string>
+ <string>&amp;Coupon</string>
</property>
</action>
</widget>
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: modules
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:48 2010
# Project: modules.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile modules.pro
@@ -24,8 +24,45 @@ DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
-SUBTARGETS =
+SUBTARGETS = \
+ sub-act
+act/$(MAKEFILE):
+ @$(CHK_DIR_EXISTS) act/ || $(MKDIR) act/
+ cd act/ && $(QMAKE) /home/nycholas/project/src/etegila/src/c-project/src/modules/act/act.pro -unix -o $(MAKEFILE)
+sub-act-qmake_all: FORCE
+ @$(CHK_DIR_EXISTS) act/ || $(MKDIR) act/
+ cd act/ && $(QMAKE) /home/nycholas/project/src/etegila/src/c-project/src/modules/act/act.pro -unix -o $(MAKEFILE)
+sub-act: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE)
+sub-act-make_default-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE)
+sub-act-make_default: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE)
+sub-act-make_first-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) first
+sub-act-make_first: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) first
+sub-act-all-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) all
+sub-act-all: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) all
+sub-act-clean-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) clean
+sub-act-clean: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) clean
+sub-act-distclean-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) distclean
+sub-act-distclean: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) distclean
+sub-act-install_subtargets-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) install
+sub-act-install_subtargets: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) install
+sub-act-uninstall_subtargets-ordered: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) uninstall
+sub-act-uninstall_subtargets: act/$(MAKEFILE) FORCE
+ cd act/ && $(MAKE) -f $(MAKEFILE) uninstall
Makefile: modules.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \
/usr/share/qt/mkspecs/common/unix.conf \
@@ -35,6 +72,8 @@ Makefile: modules.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/
/usr/share/qt/mkspecs/features/qt_config.prf \
/usr/share/qt/mkspecs/features/exclusive_builds.prf \
/usr/share/qt/mkspecs/features/default_pre.prf \
+ act/act.pri \
+ modules.pri \
/usr/share/qt/mkspecs/features/release.prf \
/usr/share/qt/mkspecs/features/default_post.prf \
/usr/share/qt/mkspecs/features/warn_on.prf \
@@ -55,6 +94,8 @@ Makefile: modules.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/
/usr/share/qt/mkspecs/features/qt_config.prf:
/usr/share/qt/mkspecs/features/exclusive_builds.prf:
/usr/share/qt/mkspecs/features/default_pre.prf:
+act/act.pri:
+modules.pri:
/usr/share/qt/mkspecs/features/release.prf:
/usr/share/qt/mkspecs/features/default_post.prf:
/usr/share/qt/mkspecs/features/warn_on.prf:
@@ -69,18 +110,20 @@ Makefile: modules.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/
qmake: qmake_all FORCE
@$(QMAKE) -unix -o Makefile modules.pro
-qmake_all: FORCE
+qmake_all: sub-act-qmake_all FORCE
-make_default: FORCE
-make_first: FORCE
-all: FORCE
-clean: FORCE
-distclean: FORCE
+make_default: sub-act-make_default-ordered FORCE
+make_first: sub-act-make_first-ordered FORCE
+all: sub-act-all-ordered FORCE
+clean: sub-act-clean-ordered FORCE
+distclean: sub-act-distclean-ordered FORCE
-$(DEL_FILE) Makefile
-install_subtargets: FORCE
-uninstall_subtargets: FORCE
+install_subtargets: sub-act-install_subtargets-ordered FORCE
+uninstall_subtargets: sub-act-uninstall_subtargets-ordered FORCE
-check:
+sub-act-check_ordered: act/$(MAKEFILE)
+ cd act/ && $(MAKE) check
+check: sub-act-check_ordered
mocclean: compiler_moc_header_clean compiler_moc_source_clean
View
@@ -0,0 +1,95 @@
+#############################################################################
+# Makefile for building: act
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:48 2010
+# Project: act.pro
+# Template: subdirs
+# Command: /usr/bin/qmake -unix -o Makefile act.pro
+#############################################################################
+
+first: make_default
+MAKEFILE = Makefile
+QMAKE = /usr/bin/qmake
+DEL_FILE = rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+COPY = cp -f
+COPY_FILE = $(COPY)
+COPY_DIR = $(COPY) -r
+INSTALL_FILE = install -m 644 -p
+INSTALL_PROGRAM = install -m 755 -p
+INSTALL_DIR = $(COPY_DIR)
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+SUBTARGETS =
+
+
+Makefile: act.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \
+ /usr/share/qt/mkspecs/common/unix.conf \
+ /usr/share/qt/mkspecs/common/linux.conf \
+ /usr/share/qt/mkspecs/qconfig.pri \
+ /usr/share/qt/mkspecs/features/qt_functions.prf \
+ /usr/share/qt/mkspecs/features/qt_config.prf \
+ /usr/share/qt/mkspecs/features/exclusive_builds.prf \
+ /usr/share/qt/mkspecs/features/default_pre.prf \
+ act.pri \
+ /usr/share/qt/mkspecs/features/release.prf \
+ /usr/share/qt/mkspecs/features/default_post.prf \
+ /usr/share/qt/mkspecs/features/warn_on.prf \
+ /usr/share/qt/mkspecs/features/qt.prf \
+ /usr/share/qt/mkspecs/features/unix/thread.prf \
+ /usr/share/qt/mkspecs/features/moc.prf \
+ /usr/share/qt/mkspecs/features/resources.prf \
+ /usr/share/qt/mkspecs/features/uic.prf \
+ /usr/share/qt/mkspecs/features/yacc.prf \
+ /usr/share/qt/mkspecs/features/lex.prf \
+ /usr/share/qt/mkspecs/features/include_source_dir.prf
+ $(QMAKE) -unix -o Makefile act.pro
+/usr/share/qt/mkspecs/common/g++.conf:
+/usr/share/qt/mkspecs/common/unix.conf:
+/usr/share/qt/mkspecs/common/linux.conf:
+/usr/share/qt/mkspecs/qconfig.pri:
+/usr/share/qt/mkspecs/features/qt_functions.prf:
+/usr/share/qt/mkspecs/features/qt_config.prf:
+/usr/share/qt/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt/mkspecs/features/default_pre.prf:
+act.pri:
+/usr/share/qt/mkspecs/features/release.prf:
+/usr/share/qt/mkspecs/features/default_post.prf:
+/usr/share/qt/mkspecs/features/warn_on.prf:
+/usr/share/qt/mkspecs/features/qt.prf:
+/usr/share/qt/mkspecs/features/unix/thread.prf:
+/usr/share/qt/mkspecs/features/moc.prf:
+/usr/share/qt/mkspecs/features/resources.prf:
+/usr/share/qt/mkspecs/features/uic.prf:
+/usr/share/qt/mkspecs/features/yacc.prf:
+/usr/share/qt/mkspecs/features/lex.prf:
+/usr/share/qt/mkspecs/features/include_source_dir.prf:
+qmake: qmake_all FORCE
+ @$(QMAKE) -unix -o Makefile act.pro
+
+qmake_all: FORCE
+
+make_default: FORCE
+make_first: FORCE
+all: FORCE
+clean: FORCE
+distclean: FORCE
+ -$(DEL_FILE) Makefile
+install_subtargets: FORCE
+uninstall_subtargets: FORCE
+
+check:
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+install: install_subtargets FORCE
+
+uninstall: uninstall_subtargets FORCE
+
+FORCE:
+
Oops, something went wrong.

0 comments on commit d8f9981

Please sign in to comment.