From: Gokul Kartha Date: Wed, 17 Nov 2010 18:52:08 +0000 (+0200) Subject: FOlder Restructure X-Git-Url: http://git.maemo.org/git/?p=photoenhancer;a=commitdiff_plain;h=97d708fe2ef37ca3096398e3293b4d2ebc0f42c1 FOlder Restructure --- diff --git a/docs/README b/docs/README new file mode 100644 index 0000000..fa03cb5 --- /dev/null +++ b/docs/README @@ -0,0 +1,12 @@ +PhotoEnhancer +--------------- + Draft :1.0 + Author:Gokul Kartha + +1)Introduction + PhotoEnhancer is a photo editing and touch app application. +2)Installation + +3)Releases + + diff --git a/src/app/n900/app.pro b/src/app/n900/app.pro new file mode 100644 index 0000000..931de25 --- /dev/null +++ b/src/app/n900/app.pro @@ -0,0 +1,14 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:47:22 2010 +###################################################################### + +TEMPLATE = app +TARGET = ../../bin/photoenhancer +DEPENDPATH += . +INCLUDEPATH +=. ../core/baseui ../core/utils +LIBS+=-L../../libs/ -lpebaseui -lpeutils +# Input +HEADERS += appwindow.h +SOURCES += appwindow.cpp main.cpp + +FORMS += diff --git a/src/app/windows/Makefile b/src/app/windows/Makefile new file mode 100644 index 0000000..78ea10d --- /dev/null +++ b/src/app/windows/Makefile @@ -0,0 +1,216 @@ +############################################################################# +# Makefile for building: ../../bin/photoenhancer +# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 17 19:56:48 2010 +# Project: app.pro +# Template: app +# Command: /usr/bin/qmake -o Makefile app.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I../core/baseui -I../core/utils -I. +LINK = g++ +LFLAGS = -Wl,-O1 +LIBS = $(SUBLIBS) -L/usr/lib -L../../libs/ -lpebaseui -lpeutils -lQtGui -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = appwindow.cpp \ + main.cpp moc_appwindow.cpp +OBJECTS = appwindow.o \ + main.o \ + moc_appwindow.o +DIST = /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf \ + /usr/share/qt4/mkspecs/features/release.prf \ + /usr/share/qt4/mkspecs/features/default_post.prf \ + /usr/share/qt4/mkspecs/features/warn_on.prf \ + /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/unix/thread.prf \ + /usr/share/qt4/mkspecs/features/moc.prf \ + /usr/share/qt4/mkspecs/features/resources.prf \ + /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + /usr/share/qt4/mkspecs/features/include_source_dir.prf \ + app.pro +QMAKE_TARGET = photoenhancer +DESTDIR = ../../bin/ +TARGET = ../../bin/photoenhancer + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): $(OBJECTS) + @$(CHK_DIR_EXISTS) ../../bin/ || $(MKDIR) ../../bin/ + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: app.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf \ + /usr/share/qt4/mkspecs/features/release.prf \ + /usr/share/qt4/mkspecs/features/default_post.prf \ + /usr/share/qt4/mkspecs/features/warn_on.prf \ + /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/unix/thread.prf \ + /usr/share/qt4/mkspecs/features/moc.prf \ + /usr/share/qt4/mkspecs/features/resources.prf \ + /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + /usr/share/qt4/mkspecs/features/include_source_dir.prf \ + /usr/lib/libQtGui.prl \ + /usr/lib/libQtCore.prl + $(QMAKE) -o Makefile app.pro +/usr/share/qt4/mkspecs/common/g++.conf: +/usr/share/qt4/mkspecs/common/unix.conf: +/usr/share/qt4/mkspecs/common/linux.conf: +/usr/share/qt4/mkspecs/qconfig.pri: +/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri: +/usr/share/qt4/mkspecs/features/qt_functions.prf: +/usr/share/qt4/mkspecs/features/qt_config.prf: +/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/usr/share/qt4/mkspecs/features/default_pre.prf: +/usr/share/qt4/mkspecs/features/release.prf: +/usr/share/qt4/mkspecs/features/default_post.prf: +/usr/share/qt4/mkspecs/features/warn_on.prf: +/usr/share/qt4/mkspecs/features/qt.prf: +/usr/share/qt4/mkspecs/features/unix/thread.prf: +/usr/share/qt4/mkspecs/features/moc.prf: +/usr/share/qt4/mkspecs/features/resources.prf: +/usr/share/qt4/mkspecs/features/uic.prf: +/usr/share/qt4/mkspecs/features/yacc.prf: +/usr/share/qt4/mkspecs/features/lex.prf: +/usr/share/qt4/mkspecs/features/include_source_dir.prf: +/usr/lib/libQtGui.prl: +/usr/lib/libQtCore.prl: +qmake: FORCE + @$(QMAKE) -o Makefile app.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/photoenhancer1.0.0 || $(MKDIR) .tmp/photoenhancer1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/photoenhancer1.0.0/ && $(COPY_FILE) --parents appwindow.h .tmp/photoenhancer1.0.0/ && $(COPY_FILE) --parents appwindow.cpp main.cpp .tmp/photoenhancer1.0.0/ && (cd `dirname .tmp/photoenhancer1.0.0` && $(TAR) photoenhancer1.0.0.tar photoenhancer1.0.0 && $(COMPRESS) photoenhancer1.0.0.tar) && $(MOVE) `dirname .tmp/photoenhancer1.0.0`/photoenhancer1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/photoenhancer1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: moc_appwindow.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_appwindow.cpp +moc_appwindow.cpp: appwindow.h + /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) appwindow.h -o moc_appwindow.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: +compiler_uic_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean + +####### Compile + +appwindow.o: appwindow.cpp appwindow.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o appwindow.o appwindow.cpp + +main.o: main.cpp appwindow.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp + +moc_appwindow.o: moc_appwindow.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_appwindow.o moc_appwindow.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/src/app/windows/app.pro b/src/app/windows/app.pro new file mode 100644 index 0000000..931de25 --- /dev/null +++ b/src/app/windows/app.pro @@ -0,0 +1,14 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:47:22 2010 +###################################################################### + +TEMPLATE = app +TARGET = ../../bin/photoenhancer +DEPENDPATH += . +INCLUDEPATH +=. ../core/baseui ../core/utils +LIBS+=-L../../libs/ -lpebaseui -lpeutils +# Input +HEADERS += appwindow.h +SOURCES += appwindow.cpp main.cpp + +FORMS += diff --git a/src/app/windows/appwindow.cpp b/src/app/windows/appwindow.cpp new file mode 100644 index 0000000..b89219e --- /dev/null +++ b/src/app/windows/appwindow.cpp @@ -0,0 +1,112 @@ +#include "appwindow.h" +#include "workspace.h" +#include +#include +#include + + +AppWindow::AppWindow(QWidget *parent):QMainWindow(parent) +{ + mWorkspace=new Workspace(); + setCentralWidget(mWorkspace); + createActions(); + createMenus(); + createToolBars(); + createStatusBar(); + readSettings(); +} + + void AppWindow::newFile() + { + + } + + void AppWindow::open() + { + + } + + bool AppWindow::save() + { + + } + + bool AppWindow::saveAs() + { + + } + + void AppWindow::createActions() + { + newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this); + newAct->setShortcuts(QKeySequence::New); + newAct->setStatusTip(tr("Create a new file")); + connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + + openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); + openAct->setShortcuts(QKeySequence::Open); + openAct->setStatusTip(tr("Open an existing file")); + connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + + saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this); + saveAct->setShortcuts(QKeySequence::Save); + saveAct->setStatusTip(tr("Save the document to disk")); + connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + + saveAsAct = new QAction(tr("Save &As..."), this); + saveAsAct->setShortcuts(QKeySequence::SaveAs); + saveAsAct->setStatusTip(tr("Save the document under a new name")); + connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + + exitAct = new QAction(tr("E&xit"), this); + exitAct->setShortcuts(QKeySequence::Quit); + exitAct->setStatusTip(tr("Exit the application")); + connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + + + menuBar()->addSeparator(); + + } + + void AppWindow::createToolBars() + { + fileToolBar = addToolBar(tr("File")); + fileToolBar->addAction(newAct); + fileToolBar->addAction(openAct); + fileToolBar->addAction(saveAct); + + + } + + void AppWindow::createStatusBar() + { + statusBar()->showMessage(tr("Ready")); + } + + void AppWindow::readSettings() + { + + } + + void AppWindow::writeSettings() + { + + } + + bool AppWindow::maybeSave() + { + + return true; + } + + + void AppWindow::createMenus() + { + fileMenu = menuBar()->addMenu(tr("&File")); + fileMenu->addAction(newAct); + fileMenu->addAction(openAct); + fileMenu->addAction(saveAct); + fileMenu->addAction(saveAsAct); + fileMenu->addSeparator(); + fileMenu->addAction(exitAct); + } diff --git a/src/app/windows/appwindow.h b/src/app/windows/appwindow.h new file mode 100644 index 0000000..42b4b47 --- /dev/null +++ b/src/app/windows/appwindow.h @@ -0,0 +1,61 @@ +#ifndef APPWINDOW_H +#define APPWINDOW_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class Workspace; + + + +class AppWindow:public QMainWindow +{ + Q_OBJECT + +public: + AppWindow(QWidget *parent=0); + +private: + QMenu *fileMenu; + QMenu *editMenu; + QToolBar *fileToolBar; + QToolBar *editToolBar; + QAction *newAct; + QAction *openAct; + QAction *saveAct; + QAction *saveAsAct; + QAction *exitAct; + + + Workspace *mWorkspace; + +private slots: + void newFile(); + void open(); + bool save(); + bool saveAs(); + +private: + + +private: + void createActions(); + void createMenus(); + void createToolBars(); + void createStatusBar(); + void readSettings(); + void writeSettings(); + bool maybeSave(); + + +}; + +#endif // APPWINDOW_H diff --git a/src/app/windows/appwindow.o b/src/app/windows/appwindow.o new file mode 100644 index 0000000..aeba1cd Binary files /dev/null and b/src/app/windows/appwindow.o differ diff --git a/src/app/windows/main.cpp b/src/app/windows/main.cpp new file mode 100644 index 0000000..b1de183 --- /dev/null +++ b/src/app/windows/main.cpp @@ -0,0 +1,9 @@ +#include +#include "appwindow.h" +int main(int argc,char **argv) +{ + QApplication app(argc,argv); + AppWindow window; + window.showMaximized(); + return app.exec(); +} diff --git a/src/app/windows/main.o b/src/app/windows/main.o new file mode 100644 index 0000000..62595cf Binary files /dev/null and b/src/app/windows/main.o differ diff --git a/src/app/windows/moc_appwindow.cpp b/src/app/windows/moc_appwindow.cpp new file mode 100644 index 0000000..c58ea64 --- /dev/null +++ b/src/app/windows/moc_appwindow.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'appwindow.h' +** +** Created: Wed Nov 17 19:56:51 2010 +** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "appwindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'appwindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 62 +#error "This file was generated using the moc from 4.7.0. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_AppWindow[] = { + + // content: + 5, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x08, + 21, 10, 10, 10, 0x08, + 33, 10, 28, 10, 0x08, + 40, 10, 28, 10, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_AppWindow[] = { + "AppWindow\0\0newFile()\0open()\0bool\0" + "save()\0saveAs()\0" +}; + +const QMetaObject AppWindow::staticMetaObject = { + { &QMainWindow::staticMetaObject, qt_meta_stringdata_AppWindow, + qt_meta_data_AppWindow, 0 } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &AppWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *AppWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *AppWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_AppWindow)) + return static_cast(const_cast< AppWindow*>(this)); + return QMainWindow::qt_metacast(_clname); +} + +int AppWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + switch (_id) { + case 0: newFile(); break; + case 1: open(); break; + case 2: { bool _r = save(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 3: { bool _r = saveAs(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + default: ; + } + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/app/windows/moc_appwindow.o b/src/app/windows/moc_appwindow.o new file mode 100644 index 0000000..13e9411 Binary files /dev/null and b/src/app/windows/moc_appwindow.o differ diff --git a/src/app/x11/appwindow.cpp b/src/app/x11/appwindow.cpp new file mode 100644 index 0000000..b89219e --- /dev/null +++ b/src/app/x11/appwindow.cpp @@ -0,0 +1,112 @@ +#include "appwindow.h" +#include "workspace.h" +#include +#include +#include + + +AppWindow::AppWindow(QWidget *parent):QMainWindow(parent) +{ + mWorkspace=new Workspace(); + setCentralWidget(mWorkspace); + createActions(); + createMenus(); + createToolBars(); + createStatusBar(); + readSettings(); +} + + void AppWindow::newFile() + { + + } + + void AppWindow::open() + { + + } + + bool AppWindow::save() + { + + } + + bool AppWindow::saveAs() + { + + } + + void AppWindow::createActions() + { + newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this); + newAct->setShortcuts(QKeySequence::New); + newAct->setStatusTip(tr("Create a new file")); + connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + + openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); + openAct->setShortcuts(QKeySequence::Open); + openAct->setStatusTip(tr("Open an existing file")); + connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + + saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this); + saveAct->setShortcuts(QKeySequence::Save); + saveAct->setStatusTip(tr("Save the document to disk")); + connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + + saveAsAct = new QAction(tr("Save &As..."), this); + saveAsAct->setShortcuts(QKeySequence::SaveAs); + saveAsAct->setStatusTip(tr("Save the document under a new name")); + connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + + exitAct = new QAction(tr("E&xit"), this); + exitAct->setShortcuts(QKeySequence::Quit); + exitAct->setStatusTip(tr("Exit the application")); + connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + + + menuBar()->addSeparator(); + + } + + void AppWindow::createToolBars() + { + fileToolBar = addToolBar(tr("File")); + fileToolBar->addAction(newAct); + fileToolBar->addAction(openAct); + fileToolBar->addAction(saveAct); + + + } + + void AppWindow::createStatusBar() + { + statusBar()->showMessage(tr("Ready")); + } + + void AppWindow::readSettings() + { + + } + + void AppWindow::writeSettings() + { + + } + + bool AppWindow::maybeSave() + { + + return true; + } + + + void AppWindow::createMenus() + { + fileMenu = menuBar()->addMenu(tr("&File")); + fileMenu->addAction(newAct); + fileMenu->addAction(openAct); + fileMenu->addAction(saveAct); + fileMenu->addAction(saveAsAct); + fileMenu->addSeparator(); + fileMenu->addAction(exitAct); + } diff --git a/src/app/x11/appwindow.h b/src/app/x11/appwindow.h new file mode 100644 index 0000000..42b4b47 --- /dev/null +++ b/src/app/x11/appwindow.h @@ -0,0 +1,61 @@ +#ifndef APPWINDOW_H +#define APPWINDOW_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class Workspace; + + + +class AppWindow:public QMainWindow +{ + Q_OBJECT + +public: + AppWindow(QWidget *parent=0); + +private: + QMenu *fileMenu; + QMenu *editMenu; + QToolBar *fileToolBar; + QToolBar *editToolBar; + QAction *newAct; + QAction *openAct; + QAction *saveAct; + QAction *saveAsAct; + QAction *exitAct; + + + Workspace *mWorkspace; + +private slots: + void newFile(); + void open(); + bool save(); + bool saveAs(); + +private: + + +private: + void createActions(); + void createMenus(); + void createToolBars(); + void createStatusBar(); + void readSettings(); + void writeSettings(); + bool maybeSave(); + + +}; + +#endif // APPWINDOW_H diff --git a/src/app/x11/main.cpp b/src/app/x11/main.cpp new file mode 100644 index 0000000..b1de183 --- /dev/null +++ b/src/app/x11/main.cpp @@ -0,0 +1,9 @@ +#include +#include "appwindow.h" +int main(int argc,char **argv) +{ + QApplication app(argc,argv); + AppWindow window; + window.showMaximized(); + return app.exec(); +} diff --git a/src/app/x11/x11.pro b/src/app/x11/x11.pro new file mode 100644 index 0000000..2c0a3e2 --- /dev/null +++ b/src/app/x11/x11.pro @@ -0,0 +1,13 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:47:22 2010 +###################################################################### + +TEMPLATE = app +TARGET = ../../../bin/photoenhancer +DEPENDPATH +=. ../../core/baseui ../../core/utils +INCLUDEPATH +=. ../../core/baseui ../../core/utils +LIBS+=-L../../../libs/ -lPEBaseui \ + -L../../../libs/ -lPEUtils +# Input +HEADERS += appwindow.h +SOURCES += appwindow.cpp main.cpp diff --git a/src/core/baseui/baseui.pro b/src/core/baseui/baseui.pro new file mode 100644 index 0000000..33253a6 --- /dev/null +++ b/src/core/baseui/baseui.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Tue Nov 16 21:24:19 2010 +###################################################################### + +TEMPLATE = lib +TARGET = ../../../libs/PEBaseui +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += workspace.h +SOURCES += workspace.cpp diff --git a/src/core/baseui/workspace.cpp b/src/core/baseui/workspace.cpp new file mode 100644 index 0000000..673555e --- /dev/null +++ b/src/core/baseui/workspace.cpp @@ -0,0 +1,29 @@ +#include "workspace.h" +#include +Workspace::Workspace(QWidget *parent) : + QWidget(parent) +{ + loadImage("/home/shakir/Desktop/Test/test1.jpg"); +} +void Workspace::loadImage(QString fileName) +{ + mImage=QImage(fileName); +} +void Workspace::zoomIn() +{ + mImage=mImage.scaledToHeight(mImage.height()*1.5); + mImage=mImage.scaledToWidth(mImage.width()*1.5); + update(); +} +void Workspace::zoomOut() +{ + mImage=mImage.scaledToHeight(mImage.height()*0.5); + mImage=mImage.scaledToWidth(mImage.width()*0.5); + update(); +} + +void Workspace::paintEvent(QPaintEvent *p) +{ + QPainter painter(this); + painter.drawImage(mImage.rect(),mImage); +} diff --git a/src/core/baseui/workspace.h b/src/core/baseui/workspace.h new file mode 100644 index 0000000..8835af4 --- /dev/null +++ b/src/core/baseui/workspace.h @@ -0,0 +1,25 @@ +#ifndef WORKSPACE_H +#define WORKSPACE_H + +#include + +class Workspace : public QWidget +{ + Q_OBJECT +public: + Workspace(QWidget *parent = 0); + void loadImage(QString fileName); + virtual void paintEvent(QPaintEvent *); +signals: + + +public slots: + void zoomIn(); + void zoomOut(); + +private: + QImage mImage; + +}; + +#endif // WORKSPACE_H diff --git a/src/core/interfaces/filterinterface.h b/src/core/interfaces/filterinterface.h new file mode 100644 index 0000000..59d25ce --- /dev/null +++ b/src/core/interfaces/filterinterface.h @@ -0,0 +1,17 @@ +#ifndef FILTERINTERFACE_H +#define FILTERINTERFACE_H +#include +#include + +class FilterInterface:public QObject +{ +public: + FilterInterface() + { + + } + virtual void applyFilter(QImage &image)=0; + virtual void displayFilterConfig(){} +}; + +#endif // FILTERINTERFACE_H diff --git a/src/core/interfaces/plugininterface.h b/src/core/interfaces/plugininterface.h new file mode 100644 index 0000000..e69de29 diff --git a/src/core/utils/logger.cpp b/src/core/utils/logger.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/core/utils/logger.h b/src/core/utils/logger.h new file mode 100644 index 0000000..e69de29 diff --git a/src/core/utils/utils.pro b/src/core/utils/utils.pro new file mode 100644 index 0000000..2bea3aa --- /dev/null +++ b/src/core/utils/utils.pro @@ -0,0 +1,12 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Wed Nov 17 19:52:33 2010 +###################################################################### + +TEMPLATE = lib +TARGET = ../../../libs/PEUtils +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += logger.h +SOURCES += logger.cpp diff --git a/src/filters/sepia/sepiafilter.o b/src/filters/sepia/sepiafilter.o new file mode 100644 index 0000000..5724403 Binary files /dev/null and b/src/filters/sepia/sepiafilter.o differ