Commit 9c1b2073 authored by arpinux's avatar arpinux

fix issues #40 #41 #42 #43

parent 296bf0c7
20xx xx xx
DFLinux-Stretch-rev1 :
- suppression de info4help (aucune utilisation sur le forum en 1 an)
- suppression du sélecteur de clavier en live, remplacé par l'applet de clavier Xfce
- suppression de mydflinux remplacé par hardinfo
- suppression du first-upgrade qui ne remplit pas sa fonction sans un update
- nettoyage
- ...
......
......@@ -25,5 +25,5 @@ d-i finish-install/reboot_in_progress note
# fix sources.list
d-i preseed/late_command string \
in-target /usr/bin/df_preseed ;\
in-target rm -f /usr/bin/df_preseed ;
in-target mv /etc/apt/sources.list /etc/apt/sources.list.back;\
in-target cp /usr/share/dflinux/sources.list /etc/apt/sources.list;
......@@ -34,5 +34,5 @@ d-i finish-install/reboot_in_progress note
# fix sources.list
d-i preseed/late_command string \
in-target /usr/bin/df_preseed ;\
in-target rm -f /usr/bin/df_preseed ;
in-target mv /etc/apt/sources.list /etc/apt/sources.list.back;\
in-target cp /usr/share/dflinux/sources.list /etc/apt/sources.list;
......@@ -19,5 +19,5 @@ d-i grub-installer/only_debian boolean true
# sources.list
d-i preseed/late_command string \
in-target sh /usr/bin/df_preseed ;\
in-target rm -f /usr/bin/df_preseed ;
in-target mv /etc/apt/sources.list /etc/apt/sources.list.back;\
in-target cp /usr/share/dflinux/sources.list /etc/apt/sources.list;
......@@ -3,10 +3,10 @@ Name=About my Debian
Name[fr]=À propos de ma Debian
Comment=Debian version and stuff
Comment[fr]=Version et diverses informations sur ma Debian
Exec=/usr/bin/mydflinux
Exec=hardinfo
Icon=debian-circle
StartupNotify=true
Terminal=false
Type=Application
Categories=X-XFCE;Utility;
X-XFCE-Source=file:///usr/share/applications/mydflinux.desktop
X-XFCE-Source=file:///usr/share/applications/hardinfo.desktop
[Desktop Entry]
Name=info4help-web
Comment=Get informations about your hardware and copy it for forums
Comment[fr]=Obtenir des informations sur votre machine et les copier pour le forum
Exec=/usr/share/info4help/info4help-web -t /usr/share/info4help/templates/bb_df
Icon=info4help-web
StartupNotify=true
Terminal=false
Type=Application
Categories=Utility;
X-XFCE-Source=file:///usr/share/applications/info4help-web.desktop
......@@ -22,6 +22,7 @@
<value type="int" value="9"/>
<value type="int" value="17"/>
<value type="int" value="7"/>
<value type="int" value="5"/>
<value type="int" value="16"/>
<value type="int" value="10"/>
</property>
......@@ -72,7 +73,6 @@
<value type="string" value="14724343383.desktop"/>
<value type="string" value="14799937901.desktop"/>
<value type="string" value="14724343386.desktop"/>
<value type="string" value="14776036081.desktop"/>
<value type="string" value="14776989021.desktop"/>
<value type="string" value="14724343385.desktop"/>
</property>
......@@ -85,5 +85,6 @@
<property name="plugin-15" type="string" value="showdesktop"/>
<property name="plugin-16" type="string" value="datetime"/>
<property name="plugin-17" type="string" value="power-manager-plugin"/>
<property name="plugin-5" type="string" value="xkb-plugin"/>
</property>
</channel>
#!/bin/bash
# post-install script for dflinux-nonfree
# team dflinux <dflinux@member.fsf.org>
#########################################
# enregistrmeent de la date d'installation
echo "installed by dflinux`date +%a\ %d\ %b\ %Y`" > /etc/dflinux
# fix sources.list
mv /etc/apt/sources.list /etc/apt/sources.list.back
cp /usr/share/dflinux/sources.list /etc/apt/sources.list
exit 0
#!/usr/bin/env python3
# -*-coding:utf-8-*
from gi.repository import Gtk
import os
import locale
LOCALE = locale.setlocale(locale.LC_ALL, "")[0:2]
class DFUpdate():
def on_button1_clicked(self, widget):
Gtk.main_quit()
def on_button2_clicked(self, widget):
os.system("gpk-update-viewer &")
Gtk.main_quit()
def __init__(self):
window = Gtk.Window()
window.set_title("DFUpdate")
window.connect("destroy", self.on_button1_clicked)
window.connect("delete_event", lambda x,y: Gtk.main_quit())
window.set_default_size(300, 200)
vBox = Gtk.VBox()
label = Gtk.Label()
if LOCALE == 'fr':
label.set_text("\n Vous venez d'installer Debian... merci :) \n" +
"\n Votre système est prêt à être utilisé, cependant \n" +
" selon la date de construction de votre image ISO, \n" +
" des mises à jour peuvent être disponibles. \n" +
"\n Désirez-vous vérifier les mises à jour disponibles ? \n" +
"\n Une connexion internet active est nécessaire. \n" +
" Votre mot de passe vous sera demandé. \n")
else:
label.set_text("\n You have just installed Debian ... merci :) \n" +
"\n Your system is ready to use, but \n" +
" depending on your ISO building date, \n" +
" some updates may be available. \n" +
"\n Do you want to check for available update(s) ? \n" +
"\n You need an active network. \n" +
" Your password will be asked. \n")
vBox.pack_start(label, False, False, 10)
hBox = Gtk.HBox()
if LOCALE == 'fr':
bouton1 = Gtk.ToggleButton(label = "non merci")
else:
bouton1 = Gtk.ToggleButton(label = "no thanks")
bouton1.connect("clicked", self.on_button1_clicked)
if LOCALE == 'fr':
bouton2 = Gtk.ToggleButton(label = "oui, merci")
else:
bouton2 = Gtk.ToggleButton(label = "yes, thanks")
bouton2.connect("clicked", self.on_button2_clicked)
hBox.add(bouton1)
hBox.add(bouton2)
vBox.pack_end(hBox, False, False, 4)
window.add(vBox)
window.show_all()
Gtk.main()
if __name__ == '__main__':
DFUpdate()
......@@ -11,11 +11,6 @@ if ! [ -e /home/$USER/.gtk-bookmarks ]; then
echo "file:///home/$USER/Vid%C3%A9os" >> /home/$USER/.gtk-bookmarks
fi
# sélecteur de clavier en live
if [ -d /home/humain ]; then
keyboard_selector
fi
# message d'accueil
zenity --title "Bienvenue sur Debian" --info --ok-label "Bonne découverte et @+" --ellipsize --text "<b>Bonjour et bienvenue sur Debian ☺</b>
......@@ -40,12 +35,4 @@ if [ -e /home/$USER/.config/autostart/welcome.desktop ]; then
rm /home/$USER/.config/autostart/welcome.desktop
fi
# lancement de la demande de mise à jour après la première installation
# vous pouvez supprimer cette section après la mise à jour
if ! [ -d /home/humain ]; then
if ! [ -e /usr/share/dflinux/firstupdate ]; then
python /usr/share/dflinux/df-first-update.py &
fi
fi
exit 0
style "clearlooks-default"
{
GtkButton ::default_border = { 0, 0, 0, 0 }
GtkRange ::trough_border = 0
GtkPaned ::handle_size = 6
GtkRange ::slider_width = 15
GtkRange ::stepper_size = 15
GtkScrollbar ::min_slider_length = 30
GtkCheckButton ::indicator_size = 14
GtkMenuBar ::internal-padding = 0
GtkTreeView ::expander_size = 14
GtkExpander ::expander_size = 16
GtkScale ::slider-length = 27
# GtkToolbar ::button-relief = GTK_RELIEF_NORMAL
# GtkMenuBar ::shadow-type = GTK_SHADOW_OUT
# GtkScrollbar ::has-secondary-forward-stepper = 1
# GtkScrollbar ::has-secondary-backward-stepper = 1
GtkButton ::child-displacement-x = 1
GtkButton ::child-displacement-y = 1
WnckTasklist ::fade-overlay-rect = 0
xthickness = 1
ythickness = 1
fg[NORMAL] = "#000000" # black
fg[PRELIGHT] = "#000000" # black
fg[SELECTED] = "#ffffff" # white
fg[ACTIVE] = "#000000" # black
fg[INSENSITIVE] = "#b5b3ac" # dark beige
bg[NORMAL] = "#eee"
bg[PRELIGHT] = "#eee" # very light beige
bg[SELECTED] = "#0061D6" # blue
bg[INSENSITIVE] = "#eee" # beige
bg[ACTIVE] = "#fff"
base[NORMAL] = "#ffffff" # white
base[PRELIGHT] = "#eee" # dark beige
base[ACTIVE] = "#0061D6" # darker blue
base[SELECTED] = "#0061D6" # blue
base[INSENSITIVE] = "#eee" # beige
text[NORMAL] = "#000000" # black
text[PRELIGHT] = "#000000" # black
text[ACTIVE] = "#ffffff" # white
text[SELECTED] = "#ffffff" # white
text[INSENSITIVE] = "#eee" # dark beige
engine "clearlooks"
{
scrollbar_color = "#0061D6"
menubarstyle = 0
progressbarstyle = 0
animation = FALSE
}
}
style "clearlooks-wide" = "clearlooks-default"
{
xthickness = 2
ythickness = 2
}
style "clearlooks-wider" = "clearlooks-default"
{
xthickness = 3
ythickness = 3
}
style "clearlooks-button" = "clearlooks-wider"
{
bg[NORMAL] = "#eee"
bg[INSENSITIVE] = "#fff"
bg[PRELIGHT] = "#fff"
}
style "clearlooks-notebook" = "clearlooks-wide"
{
bg[NORMAL] = "#eee"
bg[INSENSITIVE] = "#fff"
}
style "clearlooks-tasklist" = "clearlooks-default"
{
xthickness = 5
ythickness = 3
}
style "clearlooks-menu" = "clearlooks-default"
{
xthickness = 2
ythickness = 1
bg[NORMAL] = "#eee"
}
style "clearlooks-menubar-item" = "clearlooks-button"
{
fg[PRELIGHT] = "#000000"
}
style "clearlooks-menu-item" = "clearlooks-default"
{
xthickness = 2
ythickness = 3
fg[PRELIGHT] = "#ffffff"
text[PRELIGHT] = "#ffffff"
}
style "clearlooks-tree" = "clearlooks-default"
{
xthickness = 2
ythickness = 2
}
style "clearlooks-frame-title" = "clearlooks-default"
{
fg[NORMAL] = "#444"
}
style "clearlooks-tooltips" = "clearlooks-default"
{
xthickness = 4
ythickness = 4
bg[NORMAL] = { 1.0,1.0,0.75 }
}
style "clearlooks-progressbar" = "clearlooks-wide"
{
xthickness = 1
ythickness = 1
fg[PRELIGHT] = "#ffffff"
}
style "clearlooks-combo" = "clearlooks-button"
{
}
style "clearlooks-menubar" = "blackrock-default"
{
bg[NORMAL] = "#bacedb"
}
# widget styles
class "GtkWidget" style "clearlooks-default"
class "GtkButton" style "clearlooks-button"
class "GtkScale" style "clearlooks-button"
class "GtkCombo" style "clearlooks-button"
class "GtkRange" style "clearlooks-wide"
class "GtkFrame" style "clearlooks-wide"
class "GtkMenu" style "clearlooks-menu"
class "GtkEntry" style "clearlooks-wider"
class "GtkMenuItem" style "clearlooks-menu-item"
class "GtkNotebook" style "clearlooks-notebook"
class "GtkProgressBar" style "clearlooks-progressbar"
#class "GtkMenuBar" style "clearlooks-menubar"
widget_class "*MenuItem.*" style "clearlooks-menu-item"
#widget_class "*.GtkMenuBar.*MenuItem.*" style "clearlooks-menubar-item"
# combobox stuff
widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
# tooltips stuff
widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
widget "gtk-tooltips" style "clearlooks-tooltips"
# treeview stuff
widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
# notebook stuff
widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
# High-Contrast, Large Print, Inverse Video Theme v0.1
# This is the whole basic theme, just this one gtkrc file.
# It uses components of the standard theme engine
# Written by Bill Haneman, based on Standard theme by T. Liebeck,
# which was in turn based on lots of different gtkrc files but
# primarily the one for the metal theme.
# email: bill.haneman@sun.com
style "default"
{
GtkWidget::focus-line-pattern = "\10\2"
GtkWidget::interior_focus = 1
GtkWidget::focus-padding = 0
GtkWidget::focus-line-width = 3
# GtkWidget::cursor_aspect_ratio = 0.1
GtkHSV::focus-line-pattern = "\0"
GtkRange::slider_width = 20
GtkPaned::handle-size = 10
GtkEntry::cursor_color = "#00cccc"
GtkEntry::cursor_aspect_ratio = 0.1
GtkTreeView::expander_size = 20
GtkTextView::cursor_aspect_ratio = 0.1
GtkTextView::cursor_color = "#00cccc"
EelEditableLabel::cursor_color = "#00cccc"
EelEditableLabel::cursor_aspect_ratio = 0.1
GtkCheckButton::indicator_size = 18
GtkCheckMenuItem::indicator_size = 18
NautilusIconContainer::frame_text = 1
GtkExpander::expander-size = 24
GtkExpander::expander-spacing = 8
PanelToplevel::arrow-size = 18
fg[NORMAL] = "#ffffff"
text[NORMAL] = "#ffffff"
bg[NORMAL] = "#000033"
base[NORMAL] = "#000033"
fg[INSENSITIVE] = "#999999"
bg[INSENSITIVE] = "#333333"
text[INSENSITIVE] = "#999999"
base[INSENSITIVE] = "#333333"
fg[PRELIGHT] = "#003333"
text[PRELIGHT] = "#003333"
bg[PRELIGHT] = "#ffffff"
base[PRELIGHT] = "#ffffff"
fg[ACTIVE] = "#ffffff"
text[ACTIVE] = "#ffffff"
bg[ACTIVE] = "#666699"
base[ACTIVE] = "#666699"
fg[SELECTED] = "#000033"
text[SELECTED] = "#000033"
bg[SELECTED] = "#ffffff"
base[SELECTED] = "#ffccff"
}
class "GtkWidget" style "default"
......@@ -44,7 +44,7 @@ gnome-disk-utility gdisk dosfstools ntfs-3g ntfs-config mtools e2fsprogs
#tools
catfish zenity zip p7zip-full xarchiver htop most baobab
dvd+rw-tools xdotool eject deja-dup blueman
dvd+rw-tools xdotool eject deja-dup blueman hardinfo
#misc
gvfs gvfs-fuse fusesmb gvfs-backends x11-utils x11-apps xcalib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment