Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[icons] Use new icons and background image provided by mruk
I still don't know how icons should be managed in Nemo so I'm just
putting them in a subpackage of qmlnotes until someone changes it.
  • Loading branch information
amtep committed Sep 26, 2012
1 parent ca4711c commit 6770abe
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 9 deletions.
Binary file added icons/icon-m-notes-copy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-cut.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-delete.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-overview.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-paste.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-search.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon-m-notes-select.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/notes-background.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 14 additions & 6 deletions qml/Note.qml
Expand Up @@ -41,6 +41,14 @@ Item {
}
function releaseSearch() { editor.deselect() }

Image {
id: background

anchors.fill: parent
fillMode: Image.Stretch
source: "image://theme/notes-background"
}

Flickable {
id: editorview

Expand Down Expand Up @@ -122,18 +130,18 @@ Item {
anchors.bottom: editorview.bottom
anchors.right: editorview.right

ToolButton {
text: "Cut"
ToolIcon {
iconId: "notes-cut"
enabled: editor.selectionStart < editor.selectionEnd
onClicked: editor.cut()
}
ToolButton {
text: "Copy"
ToolIcon {
iconId: "notes-copy"
enabled: editor.selectionStart < editor.selectionEnd
onClicked: editor.copy()
}
ToolButton {
text: "Paste"
ToolIcon {
iconId: "notes-paste"
enabled: editor.canPaste
onClicked: editor.paste()
}
Expand Down
6 changes: 3 additions & 3 deletions qml/NoteRing.qml
Expand Up @@ -140,7 +140,7 @@ Page {
tools: ToolBarLayout {
ToolIcon {
objectName: 'toolbarOverviewIcon'
iconId: "toolbar-pages-all"
iconId: "notes-overview"
onClicked: {
pageStack.push(overview)
pageStack.currentPage.currentIndex = currentIndex - 1
Expand All @@ -149,7 +149,7 @@ Page {
ToolIcon {
// insert this as a placeholder to balance the toolbar
objectName: 'toolbarFindIcon'
iconId: "toolbar-search"
iconId: "notes-search"
onClicked: findbar.visible = !findbar.visible
}
Label {
Expand All @@ -162,7 +162,7 @@ Page {
}
ToolIcon {
objectName: 'toolbarSelectIcon'
iconId: "toolbar-cut-paste"
iconId: "notes-select"
onClicked: globalSelectActive = !globalSelectActive

Rectangle {
Expand Down
15 changes: 15 additions & 0 deletions rpm/qmlnotes.spec
Expand Up @@ -10,6 +10,7 @@ License: GPLv2+
URL: https://github.com/nemomobile/qmlnotes
Source0: %{name}-%{version}.tar.bz2
Requires: qt-components
Requires: %{name}-theme-blanco-extra
BuildRequires: pkgconfig(QtCore) >= 4.7.0
BuildRequires: pkgconfig(QtDeclarative)
BuildRequires: pkgconfig(QtGui)
Expand All @@ -29,6 +30,12 @@ Requires: ruby
%description tests
This package contains unit tests to be run with TDriver and testrunner-lite.

%package theme-blanco-extra
Summary: Icons and images for qmlnotes

%description theme-blanco-extra
This package contains icons and images for use by qmlnotes.

%prep
%setup -q

Expand All @@ -48,6 +55,10 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/applications
install -m 0644 qmlnotes.desktop %{buildroot}/%{_datadir}/applications/
%qmake_install
mkdir -p %{buildroot}/%{_datadir}/themes/blanco/meegotouch/images/backgrounds/
install -m 0644 images/notes-background.jpg %{buildroot}/%{_datadir}/themes/blanco/meegotouch/images/backgrounds/
mkdir -p %{buildroot}/%{_datadir}/themes/blanco/meegotouch/icons/
install -m 0644 icons/*.png %{buildroot}/%{_datadir}/themes/blanco/meegotouch/icons/

%files
%defattr(-,root,root,-)
Expand All @@ -57,3 +68,7 @@ install -m 0644 qmlnotes.desktop %{buildroot}/%{_datadir}/applications/
%files tests
%defattr(-,root,root,-)
/opt/tests/qmlnotes/

%files theme-blanco-extra
%defattr(-,root,root,-)
%{_datadir}/themes/blanco/meegotouch/

0 comments on commit 6770abe

Please sign in to comment.