mambabase: added installation choice for broadcom-sta

This commit is contained in:
Silvan Calarco 2014-10-30 19:25:04 +01:00
parent c84f4d7792
commit c88740e4ef
4 changed files with 402 additions and 368 deletions

View File

@ -841,366 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="Label">
<property name="name">
<cstring>Label17</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>570</width>
<height>110</height>
</rect>
</property>
<property name="text">
<string>The following components are recommended for optimal desktop use but do not have an Open Source license.
Warning: you'll have to accept a license agreement for most selected packages.</string>
</property>
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
<widget class="GroupBox">
<property name="name">
<cstring>GroupBox2_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>131</y>
<width>560</width>
<height>270</height>
</rect>
</property>
<property name="title">
<string>Proprietary software installations/updates</string>
</property>
<widget class="Label">
<property name="name">
<cstring>Label9_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>-10</x>
<y>-20</y>
<width>161</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_nvidia_legacy</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_fglrx_legacy</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>80</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_codecs</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>160</y>
<width>500</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&amp;Win32 codecs from mplayerhq.hu</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_msttcf</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>140</y>
<width>410</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>MS TrueT&amp;ype core fonts from sourceforge</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_flash</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>120</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>F&amp;lash plugin from adobe.com</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_skype</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>200</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>S&amp;kype from skype.com</string>
</property>
<property name="accel">
<number>276824139</number>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_java</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>180</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Oracle &amp;Java 7 from oracle.com</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_spotify</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>220</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Spot&amp;ify from spotify.com</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_virtualbox</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>240</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Virtualbo&amp;x extension pack from virtualbox.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_b43</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>100</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_fglrx</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>60</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>AMD/ATI proprietary video driver from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_nvidia</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>NVIDIA proprietary video &amp;driver from openmamba.org</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
</widget>
<widget class="ScriptObject"> <widget class="ScriptObject">
<property name="name"> <property name="name">
<cstring>checkform3</cstring> <cstring>checkform3</cstring>
@ -1258,6 +898,11 @@ if [ $? -eq 0 ]; then
dcop @dcopid KommanderIf setEnabled inst_skype false dcop @dcopid KommanderIf setEnabled inst_skype false
fi fi
openmamba-netsrpms -c broadcom-sta &gt; /dev/null
if [ $? -eq 0 ]; then
dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false
fi
openmamba-netsrpms -c b43-firmware &gt; /dev/null openmamba-netsrpms -c b43-firmware &gt; /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
dcop @dcopid KommanderIf setEnabled inst_b43 false dcop @dcopid KommanderIf setEnabled inst_b43 false
@ -1275,6 +920,391 @@ fi</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
<widget class="GroupBox">
<property name="name">
<cstring>GroupBox2_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>111</y>
<width>560</width>
<height>290</height>
</rect>
</property>
<property name="title">
<string>Proprietary software installations/updates</string>
</property>
<widget class="Label">
<property name="name">
<cstring>Label9_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>-10</x>
<y>-20</y>
<width>161</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_nvidia_legacy</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_fglrx</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>60</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>AMD/ATI proprietary video driver from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_virtualbox</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>260</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Virtualbo&amp;x extension pack from virtualbox.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_spotify</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>240</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Spot&amp;ify from spotify.com</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_skype</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>220</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>S&amp;kype from skype.com</string>
</property>
<property name="accel">
<number>276824139</number>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_java</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>200</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Oracle &amp;Java 7 from oracle.com</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_msttcf</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>160</y>
<width>410</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>MS TrueT&amp;ype core fonts from sourceforge</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_flash</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>140</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>F&amp;lash plugin from adobe.com</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_codecs</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>180</y>
<width>500</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&amp;Win32 codecs from mplayerhq.hu</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_nvidia</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>NVIDIA proprietary video &amp;driver from openmamba.org</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_fglrx_legacy</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>80</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_b43</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>120</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
<widget class="CheckBox">
<property name="name">
<cstring>inst_broadcom_sta</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>100</y>
<width>510</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
</property>
<property name="associations" stdset="0">
<stringlist>
<string></string>
<string></string>
<string></string>
</stringlist>
</property>
</widget>
</widget>
<widget class="Label">
<property name="name">
<cstring>Label17</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>570</width>
<height>60</height>
</rect>
</property>
<property name="text">
<string>The following components are recommended for optimal desktop use but do not have an Open Source license.
WARNING: you'll have to accept a license agreement for most selected packages.</string>
</property>
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
@ -1455,6 +1485,7 @@ INSTALL_NVIDIA='@inst_nvidia.checked()'
INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()' INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()'
INSTALL_FGLRX='@inst_fglrx.checked()' INSTALL_FGLRX='@inst_fglrx.checked()'
INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()' INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()'
INSTALL_BROADCOM_STA='@inst_broadcom_sta.checked()'
INSTALL_B43='@inst_b43.checked()' INSTALL_B43='@inst_b43.checked()'
INSTALL_JAVA='@inst_java.checked()' INSTALL_JAVA='@inst_java.checked()'
INSTALL_SPOTIFY='@inst_spotify.checked()' INSTALL_SPOTIFY='@inst_spotify.checked()'

View File

@ -85,6 +85,7 @@ TOTAL_PROGRESS=10
[ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_BROADCOM_STA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_B43" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_B43" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_SPOTIFY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_SPOTIFY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_VIRTUALBOX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_VIRTUALBOX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
@ -194,6 +195,12 @@ if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then
rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy
fi fi
if [ "$INSTALL_BROADCOM_STA" = "1" ]; then
echo $"Installing Broadcom proprietary wireless driver"
dcop_write $"Installing Broadcom proprietary wireless driver..." 10
rpm -q --whatprovides broadcom-sta >/dev/null || apt_get_parsed install -y broadcom-sta
fi
if [ "$INSTALL_B43" = "1" ]; then if [ "$INSTALL_B43" = "1" ]; then
echo $"Installing Broadcom B43 proprietary firmware" echo $"Installing Broadcom B43 proprietary firmware"
dcop_write $"Installing Broadcom B43 proprietary firmware..." 10 dcop_write $"Installing Broadcom B43 proprietary firmware..." 10

View File

@ -156,14 +156,12 @@ msgstr "Seleccionar los componentes no Open Source"
msgid "" msgid ""
"The following components are recommended for optimal desktop use but do not " "The following components are recommended for optimal desktop use but do not "
"have an Open Source license. \n" "have an Open Source license. \n"
"\n" "WARNING: you'll have to accept a license agreement for each selected "
"Warning: you'll have to accept a license agreement for each selected "
"packages." "packages."
msgstr "" msgstr ""
"Los siguientes componentes son recomendados para un uso óptimo del desktop pero " "Los siguientes componentes son recomendados para un uso óptimo del desktop pero "
"no tienen una licencia Open Source. \n" "no tienen una licencia Open Source. \n"
"\n" "ATENCION: debes aceptar una licencia específica para cada uno de los "
"Atención: debes aceptar una licencia específica para cada uno de los "
"componentes seleccionados." "componentes seleccionados."
#: _from_rc.cc:32 #: _from_rc.cc:32

View File

@ -156,14 +156,12 @@ msgstr "Scegliere i componenti non Open Source"
msgid "" msgid ""
"The following components are recommended for optimal desktop use but do not " "The following components are recommended for optimal desktop use but do not "
"have an Open Source license. \n" "have an Open Source license. \n"
"\n" "WARNING: you'll have to accept a license agreement for each selected "
"Warning: you'll have to accept a license agreement for each selected "
"packages." "packages."
msgstr "" msgstr ""
"I seguenti componenti sono raccomandati per un uso ottimale del desktop ma " "I seguenti componenti sono raccomandati per un uso ottimale del desktop ma "
"non hanno una licenza Open Source. \n" "non hanno una licenza Open Source. \n"
"\n" "ATTENZIONE: occorre accettare una licenza specifica per ognuno dei "
"Attenzione: occorre accettare una licenza specifica per ognuno dei "
"componenti selezionati." "componenti selezionati."
#: _from_rc.cc:32 #: _from_rc.cc:32