Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:Iktwo/evopedia

  • Loading branch information...
commit 7f686b852036c3ba01166c8fa2dff162122290b9 2 parents 2e402ee + 896b837
Peter Rhone sqrt7744 authored
Showing with 28 additions and 30 deletions.
  1. +2 −2 src.pri
  2. +25 −27 src/qml/NoArchiveDialog.qml
  3. +1 −1  src/qml/qml.qrc
4 src.pri
View
@@ -108,14 +108,14 @@ OTHER_FILES += \
src/qml/dumpSettings.qml \
src/qml/archiveDetailsDialog.qml \
src/qml/ArchiveDelegate.qml \
- src/qml/NoArchiveMsgPage.qml \
src/qml/MapPage.qml \
src/qml/Main.qml \
src/qml/DumpSettingsPage.qml \
src/qml/ArchiveDetailsPage.qml \
src/qml/AboutDialog.qml \
src/qml/SettingsPage.qml \
- src/qml/ArticleView.qml
+ src/qml/ArticleView.qml \
+ src/qml/NoArchiveDialog.qml
RESOURCES += \
resources/resources.qrc \
52 src/qml/NoArchiveDialog.qml
View
@@ -1,35 +1,33 @@
import QtQuick 1.1
import com.nokia.meego 1.0
-Page {
- Rectangle {
- id: noArchiveMsgBox
- width: 200
- height: 400
- anchors.fill: parent
- Text {
- id: archiveHeader
- anchors.top: parent.top
- anchors.verticalCenter: parent.verticalCenter
- font.pixelSize: parent / 10
- font.bold: true
- text: "No Archives Configured"
- }
+Dialog {
+ id: myDialog
+ title: Text{text:"No Archives Configured"}
+
+ content:Item {
+ id: name
+ height: 50
+ width: parent.width
Text {
- id: archiveText
- anchors.top: archiveHeader.top
- anchors.topMargin: 10
- anchors.left: parent.left
- wrapMode: Text.WordWrap
- anchors.leftMargin: 10
+ id: text
+ font.pixelSize: 22
+ anchors.centerIn: parent
+ color: "white"
text: "To be able to use evopedia you have to " +
- "download a Wikipedia archive. "+
- "This can be done from within evopedia "+
- "via the menu option \"Archives\". "+
- "If you only want to try out evopedia, "+
- "you can use the language \"small\", which "+
- "is a small version of the English Wikipedia.<br />"+
- "Do you want to download an archive now?"
+ "download a Wikipedia archive. "+
+ "This can be done from within evopedia "+
+ "via the menu option \"Archives\". "+
+ "If you only want to try out evopedia, "+
+ "you can use the language \"small\", which "+
+ "is a small version of the English Wikipedia.<br />"+
+ "Do you want to download an archive now?"
}
}
+
+ buttons: ButtonRow {
+ style: ButtonStyle { }
+ anchors.horizontalCenter: parent.horizontalCenter
+ Button {text: "OK"; onClicked: myDialog.accept()}
+ }
}
2  src/qml/qml.qrc
View
@@ -5,12 +5,12 @@
<file>DumpSettingsPage.qml</file>
<file>Main.qml</file>
<file>MapPage.qml</file>
- <file>NoArchiveMsgPage.qml</file>
<file>SearchPage.qml</file>
<file>TitlesDelegate.qml</file>
<file>SettingsPage.qml</file>
<file>AboutDialog.qml</file>
<file>TittleBar.qml</file>
<file>ArticleView.qml</file>
+ <file>NoArchiveDialog.qml</file>
</qresource>
</RCC>
Please sign in to comment.
Something went wrong with that request. Please try again.