summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2013-06-19 18:17:10 +0000
committerJarosław Staniek <staniek@kde.org>2013-06-20 00:27:00 +0200
commit201a8391160027b96cda97f9abc1e6eed288a66d (patch)
tree28ae03efb4d35fd054448ba82acf36bc468370f0
parent029a6d6caef3d3c5cc8b8d8305655dbd33112afd (diff)
Removed unnecessary comment and added missing license text.
Change-Id: I8857f018ba3077f6fbee47ef5583aa7d94dec766 Reviewed-by: Jarosław Staniek <staniek@kde.org>
-rw-r--r--src/controls/ContextMenu.qml37
-rw-r--r--src/styles/ContextMenuStyle.qml19
-rw-r--r--src/styles/DefaultSettings.js72
3 files changed, 33 insertions, 95 deletions
diff --git a/src/controls/ContextMenu.qml b/src/controls/ContextMenu.qml
index c4f21f1..0e5094e 100644
--- a/src/controls/ContextMenu.qml
+++ b/src/controls/ContextMenu.qml
@@ -1,31 +1,22 @@
/*
* Copyright (C) 2013 Tomasz Olszak <olszak.tomasz@gmail.com>
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
-
- * 1. Redistributions of source code must retain the copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
-
import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/ContextMenuStyle.qml b/src/styles/ContextMenuStyle.qml
index 76560a3..ffeb39f 100644
--- a/src/styles/ContextMenuStyle.qml
+++ b/src/styles/ContextMenuStyle.qml
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2013 Tomasz Olszak <olszak.tomasz@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/DefaultSettings.js b/src/styles/DefaultSettings.js
index fdfc30d..f0491c7 100644
--- a/src/styles/DefaultSettings.js
+++ b/src/styles/DefaultSettings.js
@@ -1096,78 +1096,6 @@ var scroll = {
width: 36
}
}
-
-// ADD_COLOR_CONFIG(JUMP_TO_TOP_NORMAL, $F032L1);
-// ADD_COLOR_CONFIG(JUMP_TO_TOP_PRESSED, $F032L1P);
-// ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $W011);
-// ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B042);
-
-// ADD_IMAGE_CONFIG(JUMP_TO_TOP_NORMAL, #00_icon_jump.png);
-// ADD_IMAGE_CONFIG(JUMP_TO_TOP_PRESSED, #00_icon_jump.png);
-// ADD_IMAGE_CONFIG(JUMP_TO_TOP_EFFECT, #00_icon_jump_ef.png);
-// ADD_IMAGE_CONFIG(JUMP_TO_LEFT_NORMAL, #00_icon_jump_left.png);
-// ADD_IMAGE_CONFIG(JUMP_TO_LEFT_PRESSED, #00_icon_jump_left.png);
-// ADD_IMAGE_CONFIG(JUMP_TO_LEFT_EFFECT, #00_icon_jump_left_ef.png);
-// ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_button_01.#.png);
-// ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL_EFFECT, #00_button_01_ef.#.png);
-// ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_button_01.#.png);
-// ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED_EFFECT, #00_button_01_ef_press.#.png);
-
-
-// START_UI_CONFIG_MODE(720x1280);
-
-
-// ADD_SHAPE_CONFIG(JUMP_TO_TOP_RIGHT_MARGIN, 26);
-// ADD_SHAPE_CONFIG(JUMP_TO_TOP_TOP_MARGIN, 18);
-// ADD_FIXED_VALUE_CONFIG(JUMP_TO_TOP_WIDTH, 74);
-// ADD_FIXED_VALUE_CONFIG(JUMP_TO_TOP_HEIGHT, 74);
-
-// ADD_SHAPE_CONFIG(HANDLER_MARGIN, 4);
-// ADD_SHAPE_CONFIG(HANDLER_MIN_WIDTH, 36);
-// ADD_SHAPE_CONFIG(HANDLER_MIN_HEIGHT, 234);
-
-
-// ADD_SHAPE_CONFIG(CONTEXTTHUMB_MIN_WIDTH, 9);
-// ADD_SHAPE_CONFIG(CONTEXTTHUMB_MIN_HEIGHT, 18);
-// ADD_SHAPE_CONFIG(CONTEXTTHUMB_MARGIN, 8);
-// END_UI_CONFIG_MODE(720x1280);
-
-
-
-
-
-
-
-
-
-
-
-
-// ADD_COLOR_CONFIG(THUMB_BG_NORMAL, $B071);
-
-// ADD_IMAGE_CONFIG(HANDLER_HORIZONTAL, #00_fast_scroll_handler_h.#.png);
-// ADD_IMAGE_CONFIG(HANDLER_VERTICAL, #00_fast_scroll_handler.#.png);
-// ADD_IMAGE_CONFIG(THUMB_HORIZONTAL_BG_NORMAL, #00_scroll_bar_h.#.png);
-// ADD_IMAGE_CONFIG(THUMB_HORIZONTAL_EFFECT, #00_scroll_bar_h_ef.#.png);
-// ADD_IMAGE_CONFIG(THUMB_VERTICAL_BG_NORMAL, #00_scroll_bar_v.#.png);
-// ADD_IMAGE_CONFIG(THUMB_VERTICAL_EFFECT, #00_scroll_bar_v_ef.#.png);
-// ADD_SHAPE_CONFIG(VERTICAL_THUMB_MIN_WIDTH, 18);
-// ADD_SHAPE_CONFIG(VERTICAL_THUMB_MIN_HEIGHT, 27);
-// ADD_SHAPE_CONFIG(VERTICAL_THUMB_MARGIN, 6);
-// ADD_SHAPE_CONFIG(HORIZONTAL_THUMB_MIN_WIDTH, 27);
-// ADD_SHAPE_CONFIG(HORIZONTAL_THUMB_MIN_HEIGHT, 18);
-// ADD_SHAPE_CONFIG(HORIZONTAL_THUMB_MARGIN, 6);
-// ADD_SHAPE_CONFIG(OVERSCROLLING_TOP_HEIGHT, 36);
-// ADD_SHAPE_CONFIG(OVERSCROLLING_BOTTOM_HEIGHT, 36);
-// ADD_SHAPE_CONFIG(OVERSCROLLING_LEFT_WIDTH, 36);
-// ADD_SHAPE_CONFIG(OVERSCROLLING_RIGHT_WIDTH, 36);
-// ADD_IMAGE_CONFIG(OVERSCROLLING_TOP_BG, #00_overscrolling_top.#.png);
-// ADD_IMAGE_CONFIG(OVERSCROLLING_BOTTOM_BG, #00_overscrolling_bottom.#.png);
-// ADD_IMAGE_CONFIG(OVERSCROLLING_LEFT_BG, #00_overscrolling_left.#.png);
-// ADD_IMAGE_CONFIG(OVERSCROLLING_RIGHT_BG, #00_overscrolling_right.#.png);
-// ADD_IMAGE_CONFIG(CONTEXTTHUMB_NORMAL, #00_popup_scroll.#.png);
-
-
}
var popup = {