Return-Path: X-Original-To: apmail-corinthia-commits-archive@minotaur.apache.org Delivered-To: apmail-corinthia-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07D7B18F6A for ; Sat, 15 Aug 2015 20:12:00 +0000 (UTC) Received: (qmail 79681 invoked by uid 500); 15 Aug 2015 20:12:00 -0000 Delivered-To: apmail-corinthia-commits-archive@corinthia.apache.org Received: (qmail 79661 invoked by uid 500); 15 Aug 2015 20:11:59 -0000 Mailing-List: contact commits-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list commits@corinthia.incubator.apache.org Received: (qmail 79652 invoked by uid 99); 15 Aug 2015 20:11:59 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Aug 2015 20:11:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 622921821E8 for ; Sat, 15 Aug 2015 20:11:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id sWN8iJ88CHCo for ; Sat, 15 Aug 2015 20:11:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 4845120758 for ; Sat, 15 Aug 2015 20:11:58 +0000 (UTC) Received: (qmail 79647 invoked by uid 99); 15 Aug 2015 20:11:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Aug 2015 20:11:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B997FDFB02; Sat, 15 Aug 2015 20:11:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jani@apache.org To: commits@corinthia.incubator.apache.org Date: Sat, 15 Aug 2015 20:11:58 -0000 Message-Id: <3b55c9625fed418a80d230b318bb53ef@git.apache.org> In-Reply-To: <48dbfe16b28544f3afc07f73657810d6@git.apache.org> References: <48dbfe16b28544f3afc07f73657810d6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-corinthia git commit: first set compiles first set compiles Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/6e55afa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/6e55afa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/6e55afa3 Branch: refs/heads/editorFramework Commit: 6e55afa377afa56a0651ac946522edb5b7a7dd04 Parents: 0731832 Author: jani Authored: Sat Aug 15 22:11:35 2015 +0200 Committer: jani Committed: Sat Aug 15 22:11:35 2015 +0200 ---------------------------------------------------------------------- .../src/Layer1_toolkit/qt/qt_toolkit.cpp | 2 + .../src/Layer1_toolkit/qt/windows.hpp | 48 ++++++++++++++++++++ 2 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/6e55afa3/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.cpp ---------------------------------------------------------------------- diff --git a/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.cpp b/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.cpp index 9b6f991..132ed8f 100644 --- a/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.cpp +++ b/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.cpp @@ -16,5 +16,7 @@ // under the License. #pragma once +#include +#include "windows.hpp" #include "qt_toolkit.hpp" http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/6e55afa3/experiments/editorFramework/src/Layer1_toolkit/qt/windows.hpp ---------------------------------------------------------------------- diff --git a/experiments/editorFramework/src/Layer1_toolkit/qt/windows.hpp b/experiments/editorFramework/src/Layer1_toolkit/qt/windows.hpp new file mode 100644 index 0000000..cdf0ee7 --- /dev/null +++ b/experiments/editorFramework/src/Layer1_toolkit/qt/windows.hpp @@ -0,0 +1,48 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#pragma once + +/******************** WINDOWS.HPP ******************** + * This file contain all the graphical classes + * inherited from Qt + */ + +#include + + + +class MainWindow : public QWidget +{ + Q_OBJECT +public: + MainWindow(QApplication *app); + virtual ~MainWindow(); + public slots: + void insertTable(); + void insertLink(); + void insertCharacter(); + void backspace(); + void moveLeft(); + void moveRight(); + void undo(); + void redo(); +private: + QApplication *_app; +// Toolbar *_toolbar; +// Editor *_editor; +};