From 069954b3d16d7c631b5fbfd511dec74637094a67 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sat, 10 Nov 2018 09:55:36 +0100 Subject: New organization of tabs, suppression of Applications/welcome alternative --- usr/share/mageiawelcome/index.html | 288 ++++++++++++++++--------------- usr/share/mageiawelcome/mageiawelcome.py | 16 +- 2 files changed, 164 insertions(+), 140 deletions(-) diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html index b5d9713..49f73ab 100644 --- a/usr/share/mageiawelcome/index.html +++ b/usr/share/mageiawelcome/index.html @@ -133,154 +133,168 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- - -
- $release
- $kernel_l $kernel
- $arch_l $arch
- $desktop_l $desktop
-
+
-
- $show       -
- -
-
-
  1. $welcome_btn
    2. -
  2. $mcc
    3. -
  3. $conf_update
    4. -
  4. $inst_remove
    5. -
-
+
+ $show      
- -
- -
  • -
    -
    $inst_remove
    -
    $guirpmdrake
    -
    -

    $rpmdrake_desc

    -

    -

    -

    $adminpass
    -
    $urpmi
    -
    -

    +

    $adminpass
    +
    • + +
  • + +
    +
    $small_selection
    + $besure_repos
    -
    +
    +
      + + +
    •   $games
      • +
    •   $internet
      • +
    •   $video
      • +
    •   $audio
      • +
    •   $office
      • +
    •   $graphics
      • +
    •   $system
      • +
    •   $programming
      • + +
      +
      $selected 0
      +
      +
      +
    +
      + $applist +
    +
    +
    • - - -
    - -
    -
    $small_selection
    - $besure_repos +
  • +
    +
    $inst_remove
    +
    $guirpmdrake
    +
    +

    $rpmdrake_desc

    +

    +

    +

    $adminpass
    +
    $urpmi
    +
    +

    +
    +
    +
    • +
  • +
    + $release
    + $kernel_l $kernel
    + $arch_l $arch
    + $desktop_l $desktop
    +
    +
    • +
  • +
    +
    $go_further
    +
    + -
    -
      - - -
    •   $games
      • -
    •   $internet
      • -
    •   $video
      • -
    •   $audio
      • -
    •   $office
      • -
    •   $graphics
      • -
    •   $system
      • -
    •   $programming
      • - -
      -
      $selected 0
      -
      -
      +
    -
      - $applist - -
    -
    -
    • +
    - -
    - + + + diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index c980038..4e9bb8d 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import signal @@ -12,6 +13,12 @@ import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk +import sys + +PACKAGE_PARENT = '..' +SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__)))) +sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) + from webgui import start_gtk_thread from webgui import launch_browser from webgui import synchronous_gtk_message @@ -84,8 +91,10 @@ def main(): l['user'] = username l['welcome_msg'] = _("

    Thank you for choosing Mageia!

    We have put in a lot of effort to provide you with the best possible system. We hope you will have a good experience with Mageia. If you feel that our project is a good idea, we would also appreciate any contribution you can make to it for next versions.

    To find out how you can help click here.

    Don't forget to tell your friends about Mageia.

    ") l['mcc'] = _("Mageia Control Center") - l['conf_update'] = _("Configure media sources and update system") + l['conf_update'] = _("Update system") l['inst_remove'] = _("Install and remove software") + l['list_config'] = _("Summary of this configuration") + l['go_further'] = _("To go further") l['h_documentation'] = _("Documentation") l['h_documentation_url'] = _("https://wiki.mageia.org/en/Documentation") l['features'] = _("New Features") @@ -131,6 +140,7 @@ def main(): l['note'] = _("Note! non-free and tainted are not enabled by default.") l['editss'] = _("Edit software sources") l['updsys'] = _("... and update system") + l['updpol'] = _("The Mageia's update policy is...") l['chkupd'] = _("Check system updates") l['guirpmdrake'] = _("GUI - RPMDrake") l['rpmdrake_desc'] = _("Rpmdrake is a program for installing, uninstalling and updating packages. It is the graphical user interface of urpmi") @@ -197,9 +207,9 @@ def main(): os.system("mkdir -p " + home + "/.mageiawelcome") os.system("touch " + home + "/.mageiawelcome/norun.flag") elif msg.startswith("http"): - subprocess.Popen(["xdg-open ", msg]) + subprocess.Popen(["xdg-open", msg]) elif msg.startswith("irc"): - subprocess.Popen(["xdg-open ", msg]) + subprocess.Popen(["xdg-open", msg]) elif msg.startswith("run"): args = shlex.split(msg) args.pop(0) -- cgit v1.2.1