OSDN Git Service

fixed preview page
authorkokkiemouse <kokkiemouse@gmail.com>
Sat, 3 Oct 2020 11:46:23 +0000 (20:46 +0900)
committerkokkiemouse <kokkiemouse@gmail.com>
Sat, 3 Oct 2020 11:46:23 +0000 (20:46 +0900)
Signed-off-by: kokkiemouse <kokkiemouse@gmail.com>
12 files changed:
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts [deleted file]
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_en.ts
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts [deleted file]
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts [deleted file]
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ja.ts [new file with mode: 0644]
channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts [deleted file]
channels/share/airootfs/usr/share/calamares/branding/serene/languages.png
channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-en.md [new file with mode: 0644]
channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-ja.md [new file with mode: 0644]
channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_2-ja.md [new file with mode: 0644]
channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_3-ja.md [new file with mode: 0644]
channels/share/airootfs/usr/share/calamares/branding/serene/show.qml

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts
deleted file mode 100644 (file)
index 3c4fe09..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ar">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../show.qml" line="64"/>
-        <source>This is a second Slide element.</source>
-        <translation>عرض الثاني</translation>
-    </message>
-    <message>
-        <location filename="../show.qml" line="68"/>
-        <source>This is a third Slide element.</source>
-        <translation>عرض الثالث</translation>
-    </message>
-</context>
-</TS>
index b02dbd5..d18f2f7 100644 (file)
@@ -1,16 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="en">
+<TS version="2.1" language="en_US">
 <context>
     <name>show</name>
     <message>
-        <location filename="../show.qml" line="64"/>
-        <source>This is a second Slide element.</source>
+        <location filename="../show.qml" line="41"/>
+        <source>Slide_Text_1</source>
+        <translation type="unfinished">&lt;h1 id=&quot;welcome-to-serene-linux&quot;&gt;Welcome to Serene Linux&lt;/h1&gt;&lt;p&gt;Serene Linux is a New OS developed based on Fedora.&lt;br/&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="52"/>
+        <source>Slide_Text_2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="63"/>
+        <source>Slide_Text_3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="74"/>
+        <source>Slide_Text_4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../show.qml" line="68"/>
-        <source>This is a third Slide element.</source>
+        <location filename="../show.qml" line="85"/>
+        <source>Slide_Text_5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts
deleted file mode 100644 (file)
index 7d1ef4e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="eo">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../show.qml" line="64"/>
-        <source>This is a second Slide element.</source>
-        <translation>Ĉi tio estas la dua gliteja.</translation>
-    </message>
-    <message>
-        <location filename="../show.qml" line="68"/>
-        <source>This is a third Slide element.</source>
-        <translation>Ĉi tio estas la tria gliteja.</translation>
-    </message>
-</context>
-</TS>
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts
deleted file mode 100644 (file)
index ec5e041..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../show.qml" line="64"/>
-        <source>This is a second Slide element.</source>
-        <translation>Ceci est la deuxieme affiche.</translation>
-    </message>
-    <message>
-        <location filename="../show.qml" line="68"/>
-        <source>This is a third Slide element.</source>
-        <translation>La troisième affice ce trouve ici.</translation>
-    </message>
-</context>
-</TS>
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ja.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ja.ts
new file mode 100644 (file)
index 0000000..0c2d163
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ja_JP">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="41"/>
+        <source>Slide_Text_1</source>
+        <translation type="unfinished">&lt;h1 id=&quot;ようこそ-serene-linuxへ&quot;&gt;ようこそ Serene Linuxへ&lt;/h1&gt;&lt;p&gt;Serene Linux はFedoraをベースとしたOSです。&lt;br/&gt;Xfceベースの美しいUIと、&lt;br /&gt;RHEL系でおなじみの&lt;b&gt;DNF&lt;/b&gt;パッケージマネージャーを搭載しています。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="52"/>
+        <source>Slide_Text_2</source>
+        <translation type="unfinished">&lt;h1 id=&quot;たくさんの使用可能なソフトウェア&quot;&gt;たくさんの使用可能なソフトウェア&lt;/h1&gt;&lt;p&gt;Serene Linux はFedoraの膨大なリポジトリが使用可能です。&lt;br /&gt; また、配布されているrpmパッケージもインストールすることが可能で、&lt;br /&gt;様々な種類のソフトウェアを使うことが可能です。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="63"/>
+        <source>Slide_Text_3</source>
+        <translation type="unfinished">&lt;h1 id=&quot;使いやすさ&quot;&gt;使いやすさ&lt;/h1&gt;&lt;p&gt;Serene LinuxではGoogleサービスが使用しやすくなっています。&lt;br /&gt; 画面下のGoogleアイコンから、Googleサービスが利用可能です。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="74"/>
+        <source>Slide_Text_4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="85"/>
+        <source>Slide_Text_5</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts
deleted file mode 100644 (file)
index 19fd583..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="nl">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../show.qml" line="64"/>
-        <source>This is a second Slide element.</source>
-        <translation>Dit is het tweede Dia element.</translation>
-    </message>
-    <message>
-        <location filename="../show.qml" line="68"/>
-        <source>This is a third Slide element.</source>
-        <translation>Dit is het derde Dia element.</translation>
-    </message>
-</context>
-</TS>
index 5331652..ff6014c 100644 (file)
Binary files a/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png and b/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png differ
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-en.md b/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-en.md
new file mode 100644 (file)
index 0000000..401dad1
--- /dev/null
@@ -0,0 +1,2 @@
+# Welcome to Serene Linux
+Serene Linux is a New OS developed based on Fedora.<br/>
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-ja.md b/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_1-ja.md
new file mode 100644 (file)
index 0000000..a2afc85
--- /dev/null
@@ -0,0 +1,2 @@
+# ようこそ Serene Linuxへ
+Serene Linux はFedoraをベースとしたOSです。<br/>Xfceベースの美しいUIと、<br />RHEL系でおなじみの<b>DNF</b>パッケージマネージャーを搭載しています。
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_2-ja.md b/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_2-ja.md
new file mode 100644 (file)
index 0000000..f950f43
--- /dev/null
@@ -0,0 +1,3 @@
+# たくさんの使用可能なソフトウェア
+Serene Linux はFedoraの膨大なリポジトリが使用可能です。<br />
+また、配布されているrpmパッケージもインストールすることが可能で、<br />様々な種類のソフトウェアを使うことが可能です。
diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_3-ja.md b/channels/share/airootfs/usr/share/calamares/branding/serene/serene_page_3-ja.md
new file mode 100644 (file)
index 0000000..3899c38
--- /dev/null
@@ -0,0 +1,3 @@
+# 使いやすさ
+Serene LinuxではGoogleサービスが使用しやすくなっています。<br />
+画面下のGoogleアイコンから、Googleサービスが利用可能です。
\ No newline at end of file
index f4c50e6..c7f9ab7 100644 (file)
@@ -1,11 +1,23 @@
-/* === This file is part of Calamares - <https://calamares.io> ===
+/* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
- *   SPDX-License-Identifier: GPL-3.0-or-later
+ *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
  *
- *   Calamares is Free Software: see the License-Identifier above.
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
  *
+ *   Calamares 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Slides images dimensions are 800x440px.
  */
 
 import QtQuick 2.0;
@@ -15,63 +27,43 @@ Presentation
 {
     id: presentation
 
-    function nextSlide() {
-        console.log("QML Component (default slideshow) Next slide");
-        presentation.goToNextSlide();
-    }
-
     Timer {
-        id: advanceTimer
-        interval: 1000
-        running: presentation.activatedInCalamares
+        interval: 20000
+        running: true
         repeat: true
-        onTriggered: nextSlide()
+        onTriggered: presentation.goToNextSlide()
     }
-
+    
     Slide {
-
-        Image {
-            id: background
-            source: "squid.png"
-            width: 200; height: 200
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
         Text {
-            anchors.horizontalCenter: background.horizontalCenter
-            anchors.top: background.bottom
-            text: "This is a customizable QML slideshow.<br/>"+
-                  "Distributions should provide their own slideshow and list it in <br/>"+
-                  "their custom branding.desc file.<br/>"+
-                  "To create a Calamares presentation in QML, import calamares.slideshow,<br/>"+
-                  "define a Presentation element with as many Slide elements as needed."
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: qsTr("Slide_Text_1")
             wrapMode: Text.WordWrap
-            width: presentation.width
+            width: 800
             horizontalAlignment: Text.Center
         }
     }
 
     Slide {
-        centeredText: qsTr("This is a second Slide element.")
+        Text {
+            anchors.horizontalCenter: background2.horizontalCenter
+            anchors.top: background2.bottom
+            text: qsTr("Slide_Text_2")
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
     }
 
     Slide {
-        centeredText: qsTr("This is a third Slide element.")
-    }
-
-    // When this slideshow is loaded as a V1 slideshow, only
-    // activatedInCalamares is set, which starts the timer (see above).
-    //
-    // In V2, also the onActivate() and onLeave() methods are called.
-    // These example functions log a message (and re-start the slides
-    // from the first).
-    function onActivate() {
-        console.log("QML Component (default slideshow) activated");
-        presentation.currentSlide = 0;
-    }
-
-    function onLeave() {
-        console.log("QML Component (default slideshow) deactivated");
+        Text {
+            anchors.horizontalCenter: background3.horizontalCenter
+            anchors.top: background3.bottom
+            text: qsTr("Slide_Text_3")
+            wrapMode: Text.WordWrap
+            width: 800
+            horizontalAlignment: Text.Center
+        }
     }
-
 }