Changeset ed51bc3


Ignore:
Timestamp:
07/11/13 14:32:31 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
ed87765
Parents:
90dc161 (diff), d9df7a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
75 added
17 edited
1 moved

Legend:

Unmodified
Added
Removed
  • .gitignore

    re618ee0 rfb7fe1b  
    5151src-qt4/qsu/Makefile 
    5252src-qt4/warden-gui/Makefile 
     53src-qt4/PCDM/PCDM-session 
     54src-qt4/PCDM/i18n/PCDM_af.qm 
     55src-qt4/PCDM/i18n/PCDM_ar.qm 
     56src-qt4/PCDM/i18n/PCDM_az.qm 
     57src-qt4/PCDM/i18n/PCDM_bg.qm 
     58src-qt4/PCDM/i18n/PCDM_bn.qm 
     59src-qt4/PCDM/i18n/PCDM_bs.qm 
     60src-qt4/PCDM/i18n/PCDM_ca.qm 
     61src-qt4/PCDM/i18n/PCDM_cs.qm 
     62src-qt4/PCDM/i18n/PCDM_cy.qm 
     63src-qt4/PCDM/i18n/PCDM_da.qm 
     64src-qt4/PCDM/i18n/PCDM_de.qm 
     65src-qt4/PCDM/i18n/PCDM_el.qm 
     66src-qt4/PCDM/i18n/PCDM_en_GB.qm 
     67src-qt4/PCDM/i18n/PCDM_en_ZA.qm 
     68src-qt4/PCDM/i18n/PCDM_es.qm 
     69src-qt4/PCDM/i18n/PCDM_et.qm 
     70src-qt4/PCDM/i18n/PCDM_eu.qm 
     71src-qt4/PCDM/i18n/PCDM_fa.qm 
     72src-qt4/PCDM/i18n/PCDM_fi.qm 
     73src-qt4/PCDM/i18n/PCDM_fr.qm 
     74src-qt4/PCDM/i18n/PCDM_fr_CA.qm 
     75src-qt4/PCDM/i18n/PCDM_fur.qm 
     76src-qt4/PCDM/i18n/PCDM_gl.qm 
     77src-qt4/PCDM/i18n/PCDM_he.qm 
     78src-qt4/PCDM/i18n/PCDM_hi.qm 
     79src-qt4/PCDM/i18n/PCDM_hr.qm 
     80src-qt4/PCDM/i18n/PCDM_hu.qm 
     81src-qt4/PCDM/i18n/PCDM_id.qm 
     82src-qt4/PCDM/i18n/PCDM_is.qm 
     83src-qt4/PCDM/i18n/PCDM_it.qm 
     84src-qt4/PCDM/i18n/PCDM_ja.qm 
     85src-qt4/PCDM/i18n/PCDM_ka.qm 
     86src-qt4/PCDM/i18n/PCDM_ko.qm 
     87src-qt4/PCDM/i18n/PCDM_lt.qm 
     88src-qt4/PCDM/i18n/PCDM_lv.qm 
     89src-qt4/PCDM/i18n/PCDM_mk.qm 
     90src-qt4/PCDM/i18n/PCDM_mn.qm 
     91src-qt4/PCDM/i18n/PCDM_ms.qm 
     92src-qt4/PCDM/i18n/PCDM_mt.qm 
     93src-qt4/PCDM/i18n/PCDM_nb.qm 
     94src-qt4/PCDM/i18n/PCDM_ne.qm 
     95src-qt4/PCDM/i18n/PCDM_nl.qm 
     96src-qt4/PCDM/i18n/PCDM_pa.qm 
     97src-qt4/PCDM/i18n/PCDM_pl.qm 
     98src-qt4/PCDM/i18n/PCDM_pt.qm 
     99src-qt4/PCDM/i18n/PCDM_pt_BR.qm 
     100src-qt4/PCDM/i18n/PCDM_ro.qm 
     101src-qt4/PCDM/i18n/PCDM_ru.qm 
     102src-qt4/PCDM/i18n/PCDM_sa.qm 
     103src-qt4/PCDM/i18n/PCDM_sk.qm 
     104src-qt4/PCDM/i18n/PCDM_sl.qm 
     105src-qt4/PCDM/i18n/PCDM_sr.qm 
     106src-qt4/PCDM/i18n/PCDM_sv.qm 
     107src-qt4/PCDM/i18n/PCDM_sw.qm 
     108src-qt4/PCDM/i18n/PCDM_ta.qm 
     109src-qt4/PCDM/i18n/PCDM_tg.qm 
     110src-qt4/PCDM/i18n/PCDM_th.qm 
     111src-qt4/PCDM/i18n/PCDM_tr.qm 
     112src-qt4/PCDM/i18n/PCDM_uk.qm 
     113src-qt4/PCDM/i18n/PCDM_uz.qm 
     114src-qt4/PCDM/i18n/PCDM_vi.qm 
     115src-qt4/PCDM/i18n/PCDM_zh_CN.qm 
     116src-qt4/PCDM/i18n/PCDM_zh_HK.qm 
     117src-qt4/PCDM/i18n/PCDM_zh_TW.qm 
     118src-qt4/PCDM/i18n/PCDM_zu.qm 
     119src-qt4/PCDM/ui_dialogKeyboard.h 
     120src-qt4/PCDM/ui_dialogLocale.h 
     121src-qt4/libpcbsd/ui/i18n/libpcbsd_af.qm 
     122src-qt4/libpcbsd/ui/i18n/libpcbsd_ar.qm 
     123src-qt4/libpcbsd/ui/i18n/libpcbsd_az.qm 
     124src-qt4/libpcbsd/ui/i18n/libpcbsd_bg.qm 
     125src-qt4/libpcbsd/ui/i18n/libpcbsd_bn.qm 
     126src-qt4/libpcbsd/ui/i18n/libpcbsd_bs.qm 
     127src-qt4/libpcbsd/ui/i18n/libpcbsd_ca.qm 
     128src-qt4/libpcbsd/ui/i18n/libpcbsd_cs.qm 
     129src-qt4/libpcbsd/ui/i18n/libpcbsd_cy.qm 
     130src-qt4/libpcbsd/ui/i18n/libpcbsd_da.qm 
     131src-qt4/libpcbsd/ui/i18n/libpcbsd_de.qm 
     132src-qt4/libpcbsd/ui/i18n/libpcbsd_el.qm 
     133src-qt4/libpcbsd/ui/i18n/libpcbsd_en_GB.qm 
     134src-qt4/libpcbsd/ui/i18n/libpcbsd_en_ZA.qm 
     135src-qt4/libpcbsd/ui/i18n/libpcbsd_es.qm 
     136src-qt4/libpcbsd/ui/i18n/libpcbsd_et.qm 
     137src-qt4/libpcbsd/ui/i18n/libpcbsd_eu.qm 
     138src-qt4/libpcbsd/ui/i18n/libpcbsd_fa.qm 
     139src-qt4/libpcbsd/ui/i18n/libpcbsd_fi.qm 
     140src-qt4/libpcbsd/ui/i18n/libpcbsd_fr.qm 
     141src-qt4/libpcbsd/ui/i18n/libpcbsd_fr_CA.qm 
     142src-qt4/libpcbsd/ui/i18n/libpcbsd_fur.qm 
     143src-qt4/libpcbsd/ui/i18n/libpcbsd_gl.qm 
     144src-qt4/libpcbsd/ui/i18n/libpcbsd_he.qm 
     145src-qt4/libpcbsd/ui/i18n/libpcbsd_hi.qm 
     146src-qt4/libpcbsd/ui/i18n/libpcbsd_hr.qm 
     147src-qt4/libpcbsd/ui/i18n/libpcbsd_hu.qm 
     148src-qt4/libpcbsd/ui/i18n/libpcbsd_id.qm 
     149src-qt4/libpcbsd/ui/i18n/libpcbsd_is.qm 
     150src-qt4/libpcbsd/ui/i18n/libpcbsd_it.qm 
     151src-qt4/libpcbsd/ui/i18n/libpcbsd_ja.qm 
     152src-qt4/libpcbsd/ui/i18n/libpcbsd_ka.qm 
     153src-qt4/libpcbsd/ui/i18n/libpcbsd_ko.qm 
     154src-qt4/libpcbsd/ui/i18n/libpcbsd_lt.qm 
     155src-qt4/libpcbsd/ui/i18n/libpcbsd_lv.qm 
     156src-qt4/libpcbsd/ui/i18n/libpcbsd_mk.qm 
     157src-qt4/libpcbsd/ui/i18n/libpcbsd_mn.qm 
     158src-qt4/libpcbsd/ui/i18n/libpcbsd_ms.qm 
     159src-qt4/libpcbsd/ui/i18n/libpcbsd_mt.qm 
     160src-qt4/libpcbsd/ui/i18n/libpcbsd_nb.qm 
     161src-qt4/libpcbsd/ui/i18n/libpcbsd_ne.qm 
     162src-qt4/libpcbsd/ui/i18n/libpcbsd_nl.qm 
     163src-qt4/libpcbsd/ui/i18n/libpcbsd_pa.qm 
     164src-qt4/libpcbsd/ui/i18n/libpcbsd_pl.qm 
     165src-qt4/libpcbsd/ui/i18n/libpcbsd_pt.qm 
     166src-qt4/libpcbsd/ui/i18n/libpcbsd_pt_BR.qm 
     167src-qt4/libpcbsd/ui/i18n/libpcbsd_ro.qm 
     168src-qt4/libpcbsd/ui/i18n/libpcbsd_ru.qm 
     169src-qt4/libpcbsd/ui/i18n/libpcbsd_sa.qm 
     170src-qt4/libpcbsd/ui/i18n/libpcbsd_sk.qm 
     171src-qt4/libpcbsd/ui/i18n/libpcbsd_sl.qm 
     172src-qt4/libpcbsd/ui/i18n/libpcbsd_sr.qm 
     173src-qt4/libpcbsd/ui/i18n/libpcbsd_sv.qm 
     174src-qt4/libpcbsd/ui/i18n/libpcbsd_sw.qm 
     175src-qt4/libpcbsd/ui/i18n/libpcbsd_ta.qm 
     176src-qt4/libpcbsd/ui/i18n/libpcbsd_tg.qm 
     177src-qt4/libpcbsd/ui/i18n/libpcbsd_th.qm 
     178src-qt4/libpcbsd/ui/i18n/libpcbsd_tr.qm 
     179src-qt4/libpcbsd/ui/i18n/libpcbsd_uk.qm 
     180src-qt4/libpcbsd/ui/i18n/libpcbsd_uz.qm 
     181src-qt4/libpcbsd/ui/i18n/libpcbsd_vi.qm 
     182src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_CN.qm 
     183src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_HK.qm 
     184src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_TW.qm 
     185src-qt4/libpcbsd/ui/i18n/libpcbsd_zu.qm 
     186src-qt4/libpcbsd/ui/ui_dialogInfoBox.h 
     187src-qt4/libpcbsd/ui/ui_dialogMetaProgress.h 
     188src-qt4/libpcbsd/ui/ui_dialogwpaenterprise.h 
     189src-qt4/pc-controlpanel/i18n/pc-controlpanel_af.qm 
     190src-qt4/pc-controlpanel/i18n/pc-controlpanel_ar.qm 
     191src-qt4/pc-controlpanel/i18n/pc-controlpanel_az.qm 
     192src-qt4/pc-controlpanel/i18n/pc-controlpanel_bg.qm 
     193src-qt4/pc-controlpanel/i18n/pc-controlpanel_bn.qm 
     194src-qt4/pc-controlpanel/i18n/pc-controlpanel_bs.qm 
     195src-qt4/pc-controlpanel/i18n/pc-controlpanel_ca.qm 
     196src-qt4/pc-controlpanel/i18n/pc-controlpanel_cs.qm 
     197src-qt4/pc-controlpanel/i18n/pc-controlpanel_cy.qm 
     198src-qt4/pc-controlpanel/i18n/pc-controlpanel_da.qm 
     199src-qt4/pc-controlpanel/i18n/pc-controlpanel_de.qm 
     200src-qt4/pc-controlpanel/i18n/pc-controlpanel_el.qm 
     201src-qt4/pc-controlpanel/i18n/pc-controlpanel_en_GB.qm 
     202src-qt4/pc-controlpanel/i18n/pc-controlpanel_en_ZA.qm 
     203src-qt4/pc-controlpanel/i18n/pc-controlpanel_es.qm 
     204src-qt4/pc-controlpanel/i18n/pc-controlpanel_et.qm 
     205src-qt4/pc-controlpanel/i18n/pc-controlpanel_eu.qm 
     206src-qt4/pc-controlpanel/i18n/pc-controlpanel_fa.qm 
     207src-qt4/pc-controlpanel/i18n/pc-controlpanel_fi.qm 
     208src-qt4/pc-controlpanel/i18n/pc-controlpanel_fr.qm 
     209src-qt4/pc-controlpanel/i18n/pc-controlpanel_fr_CA.qm 
     210src-qt4/pc-controlpanel/i18n/pc-controlpanel_fur.qm 
     211src-qt4/pc-controlpanel/i18n/pc-controlpanel_gl.qm 
     212src-qt4/pc-controlpanel/i18n/pc-controlpanel_he.qm 
     213src-qt4/pc-controlpanel/i18n/pc-controlpanel_hi.qm 
     214src-qt4/pc-controlpanel/i18n/pc-controlpanel_hr.qm 
     215src-qt4/pc-controlpanel/i18n/pc-controlpanel_hu.qm 
     216src-qt4/pc-controlpanel/i18n/pc-controlpanel_id.qm 
     217src-qt4/pc-controlpanel/i18n/pc-controlpanel_is.qm 
     218src-qt4/pc-controlpanel/i18n/pc-controlpanel_it.qm 
     219src-qt4/pc-controlpanel/i18n/pc-controlpanel_ja.qm 
     220src-qt4/pc-controlpanel/i18n/pc-controlpanel_ka.qm 
     221src-qt4/pc-controlpanel/i18n/pc-controlpanel_ko.qm 
     222src-qt4/pc-controlpanel/i18n/pc-controlpanel_lt.qm 
     223src-qt4/pc-controlpanel/i18n/pc-controlpanel_lv.qm 
     224src-qt4/pc-controlpanel/i18n/pc-controlpanel_mk.qm 
     225src-qt4/pc-controlpanel/i18n/pc-controlpanel_mn.qm 
     226src-qt4/pc-controlpanel/i18n/pc-controlpanel_ms.qm 
     227src-qt4/pc-controlpanel/i18n/pc-controlpanel_mt.qm 
     228src-qt4/pc-controlpanel/i18n/pc-controlpanel_nb.qm 
     229src-qt4/pc-controlpanel/i18n/pc-controlpanel_ne.qm 
     230src-qt4/pc-controlpanel/i18n/pc-controlpanel_nl.qm 
     231src-qt4/pc-controlpanel/i18n/pc-controlpanel_pa.qm 
     232src-qt4/pc-controlpanel/i18n/pc-controlpanel_pl.qm 
     233src-qt4/pc-controlpanel/i18n/pc-controlpanel_pt.qm 
     234src-qt4/pc-controlpanel/i18n/pc-controlpanel_pt_BR.qm 
     235src-qt4/pc-controlpanel/i18n/pc-controlpanel_ro.qm 
     236src-qt4/pc-controlpanel/i18n/pc-controlpanel_ru.qm 
     237src-qt4/pc-controlpanel/i18n/pc-controlpanel_sa.qm 
     238src-qt4/pc-controlpanel/i18n/pc-controlpanel_sk.qm 
     239src-qt4/pc-controlpanel/i18n/pc-controlpanel_sl.qm 
     240src-qt4/pc-controlpanel/i18n/pc-controlpanel_sr.qm 
     241src-qt4/pc-controlpanel/i18n/pc-controlpanel_sv.qm 
     242src-qt4/pc-controlpanel/i18n/pc-controlpanel_sw.qm 
     243src-qt4/pc-controlpanel/i18n/pc-controlpanel_ta.qm 
     244src-qt4/pc-controlpanel/i18n/pc-controlpanel_tg.qm 
     245src-qt4/pc-controlpanel/i18n/pc-controlpanel_th.qm 
     246src-qt4/pc-controlpanel/i18n/pc-controlpanel_tr.qm 
     247src-qt4/pc-controlpanel/i18n/pc-controlpanel_uk.qm 
     248src-qt4/pc-controlpanel/i18n/pc-controlpanel_uz.qm 
     249src-qt4/pc-controlpanel/i18n/pc-controlpanel_vi.qm 
     250src-qt4/pc-controlpanel/i18n/pc-controlpanel_zh_CN.qm 
     251src-qt4/pc-controlpanel/i18n/pc-controlpanel_zh_HK.qm 
     252src-qt4/pc-controlpanel/i18n/pc-controlpanel_zh_TW.qm 
     253src-qt4/pc-controlpanel/i18n/pc-controlpanel_zu.qm 
     254src-qt4/pc-controlpanel/ui_mainwnd.h 
     255src-qt4/pc-installgui/pc-sysinstaller 
     256src-qt4/pc-installgui/ui_dialogCheckHardware.h 
     257src-qt4/pc-installgui/ui_dialogDesktopSelection.h 
     258src-qt4/pc-installgui/ui_dialogFSSize.h 
     259src-qt4/pc-installgui/ui_dialogHelp.h 
     260src-qt4/pc-installgui/ui_dialogInfoBox.h 
     261src-qt4/pc-installgui/ui_dialogKeyboard.h 
     262src-qt4/pc-installgui/ui_installer.h 
     263src-qt4/pc-installgui/ui_wizardDisk.h 
     264src-qt4/pc-installgui/ui_wizardFreeBSD.h 
     265src-qt4/pc-netmanager/src/NetworkManager/ui_dnslist.h 
     266src-qt4/pc-netmanager/src/NetworkManager/ui_networkman.h 
     267src-qt4/pc-pkgmanager/i18n/PackageManager_af.qm 
     268src-qt4/pc-pkgmanager/i18n/PackageManager_ar.qm 
     269src-qt4/pc-pkgmanager/i18n/PackageManager_az.qm 
     270src-qt4/pc-pkgmanager/i18n/PackageManager_bg.qm 
     271src-qt4/pc-pkgmanager/i18n/PackageManager_bn.qm 
     272src-qt4/pc-pkgmanager/i18n/PackageManager_bs.qm 
     273src-qt4/pc-pkgmanager/i18n/PackageManager_ca.qm 
     274src-qt4/pc-pkgmanager/i18n/PackageManager_cs.qm 
     275src-qt4/pc-pkgmanager/i18n/PackageManager_cy.qm 
     276src-qt4/pc-pkgmanager/i18n/PackageManager_da.qm 
     277src-qt4/pc-pkgmanager/i18n/PackageManager_de.qm 
     278src-qt4/pc-pkgmanager/i18n/PackageManager_el.qm 
     279src-qt4/pc-pkgmanager/i18n/PackageManager_en_GB.qm 
     280src-qt4/pc-pkgmanager/i18n/PackageManager_en_ZA.qm 
     281src-qt4/pc-pkgmanager/i18n/PackageManager_es.qm 
     282src-qt4/pc-pkgmanager/i18n/PackageManager_et.qm 
     283src-qt4/pc-pkgmanager/i18n/PackageManager_eu.qm 
     284src-qt4/pc-pkgmanager/i18n/PackageManager_fa.qm 
     285src-qt4/pc-pkgmanager/i18n/PackageManager_fi.qm 
     286src-qt4/pc-pkgmanager/i18n/PackageManager_fr.qm 
     287src-qt4/pc-pkgmanager/i18n/PackageManager_fr_CA.qm 
     288src-qt4/pc-pkgmanager/i18n/PackageManager_gl.qm 
     289src-qt4/pc-pkgmanager/i18n/PackageManager_he.qm 
     290src-qt4/pc-pkgmanager/i18n/PackageManager_hi.qm 
     291src-qt4/pc-pkgmanager/i18n/PackageManager_hr.qm 
     292src-qt4/pc-pkgmanager/i18n/PackageManager_hu.qm 
     293src-qt4/pc-pkgmanager/i18n/PackageManager_id.qm 
     294src-qt4/pc-pkgmanager/i18n/PackageManager_is.qm 
     295src-qt4/pc-pkgmanager/i18n/PackageManager_it.qm 
     296src-qt4/pc-pkgmanager/i18n/PackageManager_ja.qm 
     297src-qt4/pc-pkgmanager/i18n/PackageManager_ka.qm 
     298src-qt4/pc-pkgmanager/i18n/PackageManager_ko.qm 
     299src-qt4/pc-pkgmanager/i18n/PackageManager_lt.qm 
     300src-qt4/pc-pkgmanager/i18n/PackageManager_lv.qm 
     301src-qt4/pc-pkgmanager/i18n/PackageManager_mk.qm 
     302src-qt4/pc-pkgmanager/i18n/PackageManager_mn.qm 
     303src-qt4/pc-pkgmanager/i18n/PackageManager_ms.qm 
     304src-qt4/pc-pkgmanager/i18n/PackageManager_mt.qm 
     305src-qt4/pc-pkgmanager/i18n/PackageManager_nb.qm 
     306src-qt4/pc-pkgmanager/i18n/PackageManager_nl.qm 
     307src-qt4/pc-pkgmanager/i18n/PackageManager_pa.qm 
     308src-qt4/pc-pkgmanager/i18n/PackageManager_pl.qm 
     309src-qt4/pc-pkgmanager/i18n/PackageManager_pt.qm 
     310src-qt4/pc-pkgmanager/i18n/PackageManager_pt_BR.qm 
     311src-qt4/pc-pkgmanager/i18n/PackageManager_ro.qm 
     312src-qt4/pc-pkgmanager/i18n/PackageManager_ru.qm 
     313src-qt4/pc-pkgmanager/i18n/PackageManager_sa.qm 
     314src-qt4/pc-pkgmanager/i18n/PackageManager_sk.qm 
     315src-qt4/pc-pkgmanager/i18n/PackageManager_sl.qm 
     316src-qt4/pc-pkgmanager/i18n/PackageManager_sr.qm 
     317src-qt4/pc-pkgmanager/i18n/PackageManager_sv.qm 
     318src-qt4/pc-pkgmanager/i18n/PackageManager_sw.qm 
     319src-qt4/pc-pkgmanager/i18n/PackageManager_ta.qm 
     320src-qt4/pc-pkgmanager/i18n/PackageManager_tg.qm 
     321src-qt4/pc-pkgmanager/i18n/PackageManager_th.qm 
     322src-qt4/pc-pkgmanager/i18n/PackageManager_tr.qm 
     323src-qt4/pc-pkgmanager/i18n/PackageManager_uk.qm 
     324src-qt4/pc-pkgmanager/i18n/PackageManager_uz.qm 
     325src-qt4/pc-pkgmanager/i18n/PackageManager_vi.qm 
     326src-qt4/pc-pkgmanager/i18n/PackageManager_zh_CN.qm 
     327src-qt4/pc-pkgmanager/i18n/PackageManager_zh_HK.qm 
     328src-qt4/pc-pkgmanager/i18n/PackageManager_zh_TW.qm 
     329src-qt4/pc-pkgmanager/i18n/PackageManager_zu.qm 
     330src-qt4/pc-pkgmanager/ui_dialogConfirm.h 
     331src-qt4/pc-pkgmanager/ui_mainWin.h 
     332src-qt4/pc-sysmanager/i18n/PBSystem_af.qm 
     333src-qt4/pc-sysmanager/i18n/PBSystem_ar.qm 
     334src-qt4/pc-sysmanager/i18n/PBSystem_az.qm 
     335src-qt4/pc-sysmanager/i18n/PBSystem_bg.qm 
     336src-qt4/pc-sysmanager/i18n/PBSystem_bn.qm 
     337src-qt4/pc-sysmanager/i18n/PBSystem_bs.qm 
     338src-qt4/pc-sysmanager/i18n/PBSystem_ca.qm 
     339src-qt4/pc-sysmanager/i18n/PBSystem_cs.qm 
     340src-qt4/pc-sysmanager/i18n/PBSystem_cy.qm 
     341src-qt4/pc-sysmanager/i18n/PBSystem_da.qm 
     342src-qt4/pc-sysmanager/i18n/PBSystem_de.qm 
     343src-qt4/pc-sysmanager/i18n/PBSystem_el.qm 
     344src-qt4/pc-sysmanager/i18n/PBSystem_en_GB.qm 
     345src-qt4/pc-sysmanager/i18n/PBSystem_en_ZA.qm 
     346src-qt4/pc-sysmanager/i18n/PBSystem_es.qm 
     347src-qt4/pc-sysmanager/i18n/PBSystem_et.qm 
     348src-qt4/pc-sysmanager/i18n/PBSystem_eu.qm 
     349src-qt4/pc-sysmanager/i18n/PBSystem_fa.qm 
     350src-qt4/pc-sysmanager/i18n/PBSystem_fi.qm 
     351src-qt4/pc-sysmanager/i18n/PBSystem_fr.qm 
     352src-qt4/pc-sysmanager/i18n/PBSystem_fr_CA.qm 
     353src-qt4/pc-sysmanager/i18n/PBSystem_fur.qm 
     354src-qt4/pc-sysmanager/i18n/PBSystem_gl.qm 
     355src-qt4/pc-sysmanager/i18n/PBSystem_he.qm 
     356src-qt4/pc-sysmanager/i18n/PBSystem_hi.qm 
     357src-qt4/pc-sysmanager/i18n/PBSystem_hr.qm 
     358src-qt4/pc-sysmanager/i18n/PBSystem_hu.qm 
     359src-qt4/pc-sysmanager/i18n/PBSystem_id.qm 
     360src-qt4/pc-sysmanager/i18n/PBSystem_is.qm 
     361src-qt4/pc-sysmanager/i18n/PBSystem_it.qm 
     362src-qt4/pc-sysmanager/i18n/PBSystem_ja.qm 
     363src-qt4/pc-sysmanager/i18n/PBSystem_ka.qm 
     364src-qt4/pc-sysmanager/i18n/PBSystem_ko.qm 
     365src-qt4/pc-sysmanager/i18n/PBSystem_lt.qm 
     366src-qt4/pc-sysmanager/i18n/PBSystem_lv.qm 
     367src-qt4/pc-sysmanager/i18n/PBSystem_mk.qm 
     368src-qt4/pc-sysmanager/i18n/PBSystem_mn.qm 
     369src-qt4/pc-sysmanager/i18n/PBSystem_ms.qm 
     370src-qt4/pc-sysmanager/i18n/PBSystem_mt.qm 
     371src-qt4/pc-sysmanager/i18n/PBSystem_nb.qm 
     372src-qt4/pc-sysmanager/i18n/PBSystem_ne.qm 
     373src-qt4/pc-sysmanager/i18n/PBSystem_nl.qm 
     374src-qt4/pc-sysmanager/i18n/PBSystem_pa.qm 
     375src-qt4/pc-sysmanager/i18n/PBSystem_pl.qm 
     376src-qt4/pc-sysmanager/i18n/PBSystem_pt.qm 
     377src-qt4/pc-sysmanager/i18n/PBSystem_pt_BR.qm 
     378src-qt4/pc-sysmanager/i18n/PBSystem_ro.qm 
     379src-qt4/pc-sysmanager/i18n/PBSystem_ru.qm 
     380src-qt4/pc-sysmanager/i18n/PBSystem_sa.qm 
     381src-qt4/pc-sysmanager/i18n/PBSystem_sk.qm 
     382src-qt4/pc-sysmanager/i18n/PBSystem_sl.qm 
     383src-qt4/pc-sysmanager/i18n/PBSystem_sr.qm 
     384src-qt4/pc-sysmanager/i18n/PBSystem_sv.qm 
     385src-qt4/pc-sysmanager/i18n/PBSystem_sw.qm 
     386src-qt4/pc-sysmanager/i18n/PBSystem_ta.qm 
     387src-qt4/pc-sysmanager/i18n/PBSystem_tg.qm 
     388src-qt4/pc-sysmanager/i18n/PBSystem_th.qm 
     389src-qt4/pc-sysmanager/i18n/PBSystem_tr.qm 
     390src-qt4/pc-sysmanager/i18n/PBSystem_uk.qm 
     391src-qt4/pc-sysmanager/i18n/PBSystem_uz.qm 
     392src-qt4/pc-sysmanager/i18n/PBSystem_vi.qm 
     393src-qt4/pc-sysmanager/i18n/PBSystem_zh_CN.qm 
     394src-qt4/pc-sysmanager/i18n/PBSystem_zh_HK.qm 
     395src-qt4/pc-sysmanager/i18n/PBSystem_zh_TW.qm 
     396src-qt4/pc-sysmanager/i18n/PBSystem_zu.qm 
     397src-qt4/pc-sysmanager/ui_pbsystemtab.h 
     398src-qt4/pc-sysmanager/ui_portsnapprogress.h 
     399src-qt4/pc-sysmanager/ui_updaterDialog.h 
     400src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_af.qm 
     401src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ar.qm 
     402src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_az.qm 
     403src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_bg.qm 
     404src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_bn.qm 
     405src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_bs.qm 
     406src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ca.qm 
     407src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_cs.qm 
     408src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_cy.qm 
     409src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_da.qm 
     410src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_de.qm 
     411src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_el.qm 
     412src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_en_GB.qm 
     413src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_en_ZA.qm 
     414src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_es.qm 
     415src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_et.qm 
     416src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_eu.qm 
     417src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_fa.qm 
     418src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_fi.qm 
     419src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_fr.qm 
     420src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_fr_CA.qm 
     421src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_fur.qm 
     422src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_gl.qm 
     423src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_he.qm 
     424src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_hi.qm 
     425src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_hr.qm 
     426src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_hu.qm 
     427src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_id.qm 
     428src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_is.qm 
     429src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_it.qm 
     430src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ja.qm 
     431src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ka.qm 
     432src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ko.qm 
     433src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_lt.qm 
     434src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_lv.qm 
     435src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_mk.qm 
     436src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_mn.qm 
     437src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ms.qm 
     438src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_mt.qm 
     439src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_nb.qm 
     440src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ne.qm 
     441src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_nl.qm 
     442src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_pa.qm 
     443src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_pl.qm 
     444src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_pt.qm 
     445src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_pt_BR.qm 
     446src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ro.qm 
     447src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ru.qm 
     448src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sa.qm 
     449src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sk.qm 
     450src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sl.qm 
     451src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sr.qm 
     452src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sv.qm 
     453src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_sw.qm 
     454src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ta.qm 
     455src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_tg.qm 
     456src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_th.qm 
     457src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_tr.qm 
     458src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_uk.qm 
     459src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_uz.qm 
     460src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_vi.qm 
     461src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_zh_CN.qm 
     462src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_zh_HK.qm 
     463src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_zh_TW.qm 
     464src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_zu.qm 
     465src-qt4/pc-updategui/ui_mainWin.h 
     466src-qt4/warden-gui/ui_dialogEditIP.h 
     467src-qt4/warden-gui/ui_dialogTemplates.h 
     468src-qt4/warden-gui/ui_dialogconfig.h 
     469src-qt4/warden-gui/ui_dialogdisplayoutput.h 
     470src-qt4/warden-gui/ui_dialogimport.h 
     471src-qt4/warden-gui/ui_dialogwarden.h 
     472src-qt4/warden-gui/ui_dialogworking.h 
     473src-qt4/warden-gui/ui_wizardNewJail.h 
     474src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/.directory 
    53475 
    54476# Compiled binaries 
  • build-files/ports-overlay/misc/pcbsd-base/Makefile

    r5e1ad95 r758e0db  
    6767                gutenprint-foomatic>=0:${PORTSDIR}/print/gutenprint-foomatic \ 
    6868                system-config-printer:${PORTSDIR}/print/system-config-printer \ 
    69                 gdm:${PORTSDIR}/x11/gdm \ 
    70                 gnome-session:${PORTSDIR}/x11/gnome-session \ 
    71                 gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \ 
    72                 libgnomeui>=0:${PORTSDIR}/x11-toolkits/libgnomeui \ 
    7369                mc:${PORTSDIR}/misc/mc \ 
    7470                at-spi>=0:${PORTSDIR}/accessibility/at-spi \ 
  • src-qt4/libpcbsd/utils/utils.cpp

    r1620346 r1c4b1ae  
    148148        line.replace(envVal + "=", ""); 
    149149 
    150         if ( line.indexOf('"') == 0 ) 
     150        if ( line.indexOf('"') == 0 ) { 
    151151           line = line.section('"', 1, 1); 
    152         else 
    153            line = line.section(' ', 1, 1); 
     152           line = line.section('"', 0, 0); 
     153        } 
    154154 
    155155        confFile.close(); 
    156         return line; 
     156        return line.simplified(); 
    157157     } 
    158158  } 
  • src-qt4/pc-firstbootgui/firstboot.ui

    re9326b4 r7eca391  
    779779             <string>Will encrypt users home-directory</string> 
    780780            </property> 
     781            <property name="styleSheet"> 
     782             <string notr="true">background: transparent;</string> 
     783            </property> 
    781784            <property name="text"> 
    782785             <string>Encrypt user files</string> 
  • src-qt4/pc-installgui/installer.cpp

    ra298a29 r023bab4  
    486486     desks->programInit(listServerPkgs,selectedPkgs); 
    487487  desks->setWindowModality(Qt::ApplicationModal); 
     488  customPkgsSet = true; 
    488489  connect(desks, SIGNAL(saved(QStringList)), this, SLOT(slotSaveMetaChanges(QStringList))); 
    489490  desks->show(); 
     
    528529  if ( radioDesktop->isChecked() ) 
    529530  { 
    530       selectedPkgs << "KDE" << "KDE-Accessibility" << "KDE-Artwork" << "KDE-Education" << "KDE-Games" << "KDE-Graphics" << "KDE-Multimedia" << "KDE-Network" << "KDE-PIM"; 
     531      selectedPkgs << "KDE" << "KDE-Accessibility" << "KDE-Artwork" << "KDE-Graphics" << "KDE-Multimedia" << "KDE-Network" << "KDE-PIM"; 
    531532 
    532533      // Include i18n stuff? 
     
    576577void Installer::initDesktopSelector() 
    577578{ 
     579    // Using default pkg sets for now 
     580    customPkgsSet = false; 
    578581    connect(pushDeskCustomize,SIGNAL(clicked()), this, SLOT(slotDesktopCustomizeClicked())); 
    579582    connect(radioDesktop,SIGNAL(clicked()), this, SLOT(slotChangedMetaPkgSelection())); 
     
    626629{ 
    627630   QString tmp; 
     631 
     632   // Update package selection in case user changed language, etc 
     633   if ( installStackWidget->currentIndex() == 0 && hasPkgsOnMedia && !customPkgsSet) { 
     634     slotChangedMetaPkgSelection(); 
     635   } 
    628636 
    629637   // If no pkgs on media 
  • src-qt4/pc-installgui/installer.h

    rea6d5ac r023bab4  
    105105    QGraphicsScene *defaultScene; 
    106106    QGraphicsScene *customScene; 
     107    bool customPkgsSet; 
    107108     
    108109    // Encryption bits 
  • src-qt4/port-files/pkg-plist

    r360bff2 rfb7fe1b  
    1212bin/pc-cupscfg 
    1313bin/pc-firstboot 
    14 bin/pc-gdmconf 
     14bin/pc-dmconf 
    1515bin/pc-mounttray 
    1616bin/pc-netmanager 
     
    407407share/pcbsd/pc-controlpanel/icons/cups-icon.png 
    408408share/pcbsd/pc-controlpanel/items/system/pbi-thefish.desktop 
    409 share/pcbsd/pc-controlpanel/items/system/pc-gdmconf.desktop 
     409share/pcbsd/pc-controlpanel/items/system/pc-dmconf.desktop 
    410410share/pcbsd/pc-controlpanel/items/system/lxde-lxtask.desktop 
    411411share/pcbsd/pc-controlpanel/items/system/pcusermanager.desktop 
     
    479479share/pcbsd/pc-controlpanel/items/hardware/nvidia-settings.desktop 
    480480share/pcbsd/icons/about.png 
    481 share/pcbsd/icons/pc-gdmconf.png 
     481share/pcbsd/icons/pc-dmconf.png 
    482482share/pcbsd/icons/appcafe.png 
    483483share/pcbsd/i18n/libpcbsd_af.qm 
     
    10611061share/pcbsd/i18n/FirstBoot_ar.qm 
    10621062share/pcbsd/i18n/FirstBoot_zu.qm 
    1063 share/pcbsd/i18n/pc-gdmconf_af.qm 
    1064 share/pcbsd/i18n/pc-gdmconf_zh_TW.qm 
    1065 share/pcbsd/i18n/pc-gdmconf_zh_HK.qm 
    1066 share/pcbsd/i18n/pc-gdmconf_zh_CN.qm 
    1067 share/pcbsd/i18n/pc-gdmconf_vi.qm 
    1068 share/pcbsd/i18n/pc-gdmconf_uz.qm 
    1069 share/pcbsd/i18n/pc-gdmconf_uk.qm 
    1070 share/pcbsd/i18n/pc-gdmconf_tr.qm 
    1071 share/pcbsd/i18n/pc-gdmconf_th.qm 
    1072 share/pcbsd/i18n/pc-gdmconf_tg.qm 
    1073 share/pcbsd/i18n/pc-gdmconf_ta.qm 
    1074 share/pcbsd/i18n/pc-gdmconf_sw.qm 
    1075 share/pcbsd/i18n/pc-gdmconf_sv.qm 
    1076 share/pcbsd/i18n/pc-gdmconf_sr.qm 
    1077 share/pcbsd/i18n/pc-gdmconf_sl.qm 
    1078 share/pcbsd/i18n/pc-gdmconf_sa.qm 
    1079 share/pcbsd/i18n/pc-gdmconf_sk.qm 
    1080 share/pcbsd/i18n/pc-gdmconf_ru.qm 
    1081 share/pcbsd/i18n/pc-gdmconf_ro.qm 
    1082 share/pcbsd/i18n/pc-gdmconf_pt_BR.qm 
    1083 share/pcbsd/i18n/pc-gdmconf_pt.qm 
    1084 share/pcbsd/i18n/pc-gdmconf_pl.qm 
    1085 share/pcbsd/i18n/pc-gdmconf_pa.qm 
    1086 share/pcbsd/i18n/pc-gdmconf_nl.qm 
    1087 share/pcbsd/i18n/pc-gdmconf_ne.qm 
    1088 share/pcbsd/i18n/pc-gdmconf_nb.qm 
    1089 share/pcbsd/i18n/pc-gdmconf_mt.qm 
    1090 share/pcbsd/i18n/pc-gdmconf_ms.qm 
    1091 share/pcbsd/i18n/pc-gdmconf_mn.qm 
    1092 share/pcbsd/i18n/pc-gdmconf_mk.qm 
    1093 share/pcbsd/i18n/pc-gdmconf_lv.qm 
    1094 share/pcbsd/i18n/pc-gdmconf_lt.qm 
    1095 share/pcbsd/i18n/pc-gdmconf_ko.qm 
    1096 share/pcbsd/i18n/pc-gdmconf_ka.qm 
    1097 share/pcbsd/i18n/pc-gdmconf_ja.qm 
    1098 share/pcbsd/i18n/pc-gdmconf_it.qm 
    1099 share/pcbsd/i18n/pc-gdmconf_is.qm 
    1100 share/pcbsd/i18n/pc-gdmconf_id.qm 
    1101 share/pcbsd/i18n/pc-gdmconf_hu.qm 
    1102 share/pcbsd/i18n/pc-gdmconf_hr.qm 
    1103 share/pcbsd/i18n/pc-gdmconf_hi.qm 
    1104 share/pcbsd/i18n/pc-gdmconf_he.qm 
    1105 share/pcbsd/i18n/pc-gdmconf_gl.qm 
    1106 share/pcbsd/i18n/pc-gdmconf_fur.qm 
    1107 share/pcbsd/i18n/pc-gdmconf_fr_CA.qm 
    1108 share/pcbsd/i18n/pc-gdmconf_fr.qm 
    1109 share/pcbsd/i18n/pc-gdmconf_fi.qm 
    1110 share/pcbsd/i18n/pc-gdmconf_fa.qm 
    1111 share/pcbsd/i18n/pc-gdmconf_eu.qm 
    1112 share/pcbsd/i18n/pc-gdmconf_et.qm 
    1113 share/pcbsd/i18n/pc-gdmconf_es.qm 
    1114 share/pcbsd/i18n/pc-gdmconf_en_ZA.qm 
    1115 share/pcbsd/i18n/pc-gdmconf_en_GB.qm 
    1116 share/pcbsd/i18n/pc-gdmconf_el.qm 
    1117 share/pcbsd/i18n/pc-gdmconf_de.qm 
    1118 share/pcbsd/i18n/pc-gdmconf_da.qm 
    1119 share/pcbsd/i18n/pc-gdmconf_cy.qm 
    1120 share/pcbsd/i18n/pc-gdmconf_cs.qm 
    1121 share/pcbsd/i18n/pc-gdmconf_ca.qm 
    1122 share/pcbsd/i18n/pc-gdmconf_bs.qm 
    1123 share/pcbsd/i18n/pc-gdmconf_bn.qm 
    1124 share/pcbsd/i18n/pc-gdmconf_bg.qm 
    1125 share/pcbsd/i18n/pc-gdmconf_az.qm 
    1126 share/pcbsd/i18n/pc-gdmconf_ar.qm 
    1127 share/pcbsd/i18n/pc-gdmconf_zu.qm 
     1063share/pcbsd/i18n/pc-dmconf_af.qm 
     1064share/pcbsd/i18n/pc-dmconf_zh_TW.qm 
     1065share/pcbsd/i18n/pc-dmconf_zh_HK.qm 
     1066share/pcbsd/i18n/pc-dmconf_zh_CN.qm 
     1067share/pcbsd/i18n/pc-dmconf_vi.qm 
     1068share/pcbsd/i18n/pc-dmconf_uz.qm 
     1069share/pcbsd/i18n/pc-dmconf_uk.qm 
     1070share/pcbsd/i18n/pc-dmconf_tr.qm 
     1071share/pcbsd/i18n/pc-dmconf_th.qm 
     1072share/pcbsd/i18n/pc-dmconf_tg.qm 
     1073share/pcbsd/i18n/pc-dmconf_ta.qm 
     1074share/pcbsd/i18n/pc-dmconf_sw.qm 
     1075share/pcbsd/i18n/pc-dmconf_sv.qm 
     1076share/pcbsd/i18n/pc-dmconf_sr.qm 
     1077share/pcbsd/i18n/pc-dmconf_sl.qm 
     1078share/pcbsd/i18n/pc-dmconf_sa.qm 
     1079share/pcbsd/i18n/pc-dmconf_sk.qm 
     1080share/pcbsd/i18n/pc-dmconf_ru.qm 
     1081share/pcbsd/i18n/pc-dmconf_ro.qm 
     1082share/pcbsd/i18n/pc-dmconf_pt_BR.qm 
     1083share/pcbsd/i18n/pc-dmconf_pt.qm 
     1084share/pcbsd/i18n/pc-dmconf_pl.qm 
     1085share/pcbsd/i18n/pc-dmconf_pa.qm 
     1086share/pcbsd/i18n/pc-dmconf_nl.qm 
     1087share/pcbsd/i18n/pc-dmconf_ne.qm 
     1088share/pcbsd/i18n/pc-dmconf_nb.qm 
     1089share/pcbsd/i18n/pc-dmconf_mt.qm 
     1090share/pcbsd/i18n/pc-dmconf_ms.qm 
     1091share/pcbsd/i18n/pc-dmconf_mn.qm 
     1092share/pcbsd/i18n/pc-dmconf_mk.qm 
     1093share/pcbsd/i18n/pc-dmconf_lv.qm 
     1094share/pcbsd/i18n/pc-dmconf_lt.qm 
     1095share/pcbsd/i18n/pc-dmconf_ko.qm 
     1096share/pcbsd/i18n/pc-dmconf_ka.qm 
     1097share/pcbsd/i18n/pc-dmconf_ja.qm 
     1098share/pcbsd/i18n/pc-dmconf_it.qm 
     1099share/pcbsd/i18n/pc-dmconf_is.qm 
     1100share/pcbsd/i18n/pc-dmconf_id.qm 
     1101share/pcbsd/i18n/pc-dmconf_hu.qm 
     1102share/pcbsd/i18n/pc-dmconf_hr.qm 
     1103share/pcbsd/i18n/pc-dmconf_hi.qm 
     1104share/pcbsd/i18n/pc-dmconf_he.qm 
     1105share/pcbsd/i18n/pc-dmconf_gl.qm 
     1106share/pcbsd/i18n/pc-dmconf_fur.qm 
     1107share/pcbsd/i18n/pc-dmconf_fr_CA.qm 
     1108share/pcbsd/i18n/pc-dmconf_fr.qm 
     1109share/pcbsd/i18n/pc-dmconf_fi.qm 
     1110share/pcbsd/i18n/pc-dmconf_fa.qm 
     1111share/pcbsd/i18n/pc-dmconf_eu.qm 
     1112share/pcbsd/i18n/pc-dmconf_et.qm 
     1113share/pcbsd/i18n/pc-dmconf_es.qm 
     1114share/pcbsd/i18n/pc-dmconf_en_ZA.qm 
     1115share/pcbsd/i18n/pc-dmconf_en_GB.qm 
     1116share/pcbsd/i18n/pc-dmconf_el.qm 
     1117share/pcbsd/i18n/pc-dmconf_de.qm 
     1118share/pcbsd/i18n/pc-dmconf_da.qm 
     1119share/pcbsd/i18n/pc-dmconf_cy.qm 
     1120share/pcbsd/i18n/pc-dmconf_cs.qm 
     1121share/pcbsd/i18n/pc-dmconf_ca.qm 
     1122share/pcbsd/i18n/pc-dmconf_bs.qm 
     1123share/pcbsd/i18n/pc-dmconf_bn.qm 
     1124share/pcbsd/i18n/pc-dmconf_bg.qm 
     1125share/pcbsd/i18n/pc-dmconf_az.qm 
     1126share/pcbsd/i18n/pc-dmconf_ar.qm 
     1127share/pcbsd/i18n/pc-dmconf_zu.qm 
    11281128share/pcbsd/i18n/MountTray_af.qm 
    11291129share/pcbsd/i18n/MountTray_zh_TW.qm 
     
    24262426share/applications/pccontrol.desktop 
    24272427share/applications/pcbugreport.desktop 
    2428 share/applications/pcgdmconf.desktop 
     2428share/applications/pc-dmconf.desktop 
    24292429share/applications/pcbsd-pbi.desktop 
    24302430share/applications/defaults.list 
  • src-qt4/src-qt4.pro

    rdc23852 rfb7fe1b  
    1212         pc-cupscfg \ 
    1313         pc-firstbootgui \ 
    14          pc-gdmconf \ 
     14         pc-dmconf \ 
    1515         pc-mounttray \ 
    1616         pc-netmanager \ 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/rc.d/pefs

    rf5021cc rd9df7a9  
    3535        do 
    3636                # Make sure pefs is not already mounted 
    37                 mount | grep -q -e "${pefsmnt} on" -e "pefs"  
     37                mount | grep -q -e " on ${pefsmnt} (pefs" 
    3838                if [ $? -eq 0 ] ; then continue ; fi 
    3939                source=`echo "$pefsmnt" | cut -d ' ' -f 1` 
  • src-qt4/PCDM/PCDMd

    r39fe8b0 r90dc161  
    1818 
    1919  # Allow Auto-Login the first time PCDM starts 
    20   touch /tmp/.PCDMAUTOLOGINFILE 
     20  touch /tmp/.PCDMAutoLogin 
    2121  # Now start the X Server 
    2222  while [ ! -e /var/run/nologin ]; do 
  • src-qt4/PCDM/src/main.cpp

    r39fe8b0 r90dc161  
    4242  // Load the configuration file 
    4343  QString confFile = "/usr/local/etc/pcdm.conf"; 
    44   if(!QFile::exists(confFile)){ confFile = ":samples/pcdm.conf"; } 
     44  if(!QFile::exists(confFile)){  
     45    qDebug() << "PCDM: Configuration file missing:"<<confFile<<"\n  - Using default configuration"; 
     46    confFile = ":samples/pcdm.conf";  
     47  } 
     48   
    4549  Config::loadConfigFile(confFile); 
    4650  //qDebug() << "Config File Loaded:" << QString::number(clock.elapsed())+" ms"; 
     
    6165  //*** STARTUP THE PROGRAM *** 
    6266  bool goodAL = FALSE; //Flag for whether the autologin was successful 
    63    
    6467  // Start the autologin procedure if applicable 
    6568  if( ALtriggered && Config::useAutoLogin() ){ 
    6669    //Setup the Auto Login 
    6770    QString user = Backend::getALUsername(); 
    68     QString dcmd = Backend::getALDesktopCmd(); 
    6971    QString pwd = Backend::getALPassword(); 
    70     if( user.isEmpty() || dcmd.isEmpty() ){ 
     72    QString dsk = Backend::getLastDE(user); 
     73    if( user.isEmpty() || dsk.isEmpty() ){ 
    7174         goodAL=FALSE;    
    7275    }else{ 
    73         desktop.loginToXSession(user,pwd, Backend::getUserHomeDir(user), dcmd); 
     76        desktop.loginToXSession(user,pwd, Backend::getUserHomeDir(user), dsk); 
    7477        splash.close(); 
    7578        if(desktop.isRunning()){ 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    r1620346 r90dc161  
    1414QStringList displaynameList,usernameList,homedirList,instXNameList,instXBinList,instXCommentList,instXIconList; 
    1515QString logFile; 
    16 QString saveX,saveUsername; 
     16QString saveX,saveUsername, lastUser, lastDE; 
    1717 
    1818QStringList Backend::getAvailableDesktops(){   
     
    6969} 
    7070 
    71 QString Backend::getALDesktopCmd(){ 
    72    // Make sure the desired desktop is valid 
    73   QString rdesktop = Config::autoLoginDesktop(); 
    74   if(!QFile::exists(rdesktop)){ //requested file does not exist 
    75     log("Invalid Auto-Login desktop requested - skipping...."); 
    76     return ""; 
    77   } 
    78   QStringList result = readXSessionsFile(rdesktop,""); 
    79   if(result.isEmpty()){  //requested file is not a valid xsessions file 
    80     log("Invalid Auto-Login desktop requested - skipping...."); 
    81     return "";             
    82   } 
    83   if(!result[0].startsWith("/")){ result[0] = "/usr/local/bin/"+result[0]; } 
    84   rdesktop = result[0]; //(absolute path) executable 
    85   if(!QFile::exists(rdesktop)){  //requested desktop is not currently installed 
    86     log("Invalid Auto-Login desktop requested - skipping...."); 
    87     return "";             
    88   } 
    89   return rdesktop; 
    90 } 
    91  
    9271QString Backend::getALPassword(){ 
    9372  QString rpassword = Config::autoLoginPassword(); 
     
    9978  return usernameList[i]; 
    10079} 
     80 
     81QString Backend::getDisplayNameFromUsername(QString username){ 
     82  int i = usernameList.indexOf(username); 
     83  return displaynameList[i];   
     84} 
     85 
    10186QString Backend::getUserHomeDir(QString username){ 
    10287  int i = usernameList.indexOf(username); 
     
    234219  if(!mainDir.exists("themes")){ mainDir.mkdir("themes"); } 
    235220  //Check for sample files 
    236   if(!mainDir.exists("pcdm.conf.sample")){ QFile::copy(":samples/pcdm.conf",base+"/pcdm.conf.sample"); } 
    237   //if(!mainDir.exists("pcdm.theme.sample")){ QFile::copy(":samples/themes/default/default.theme",base+"/pcdm.theme.sample"); } 
     221  if(!mainDir.exists("pcdm.conf.sample")){ QFile::copy(":samples/pcdm.conf",base+"/pcdm.conf.sample"); }  
     222} 
     223 
     224QString Backend::getLastUser(){ 
     225  //Load the file if necessary 
     226  if(lastUser.isEmpty()){ 
     227    readSystemLastLogin();   
     228  } 
     229  //return the value 
     230  return lastUser; 
     231} 
     232 
     233QString Backend::getLastDE(QString user){ 
     234  if(lastDE.isEmpty()){ 
     235    readSystemLastLogin(); 
     236  } 
     237  QString de = readUserLastDesktop(user); 
     238  if(de.isEmpty()){ return lastDE; } 
     239  else{ return de; } 
    238240   
     241} 
     242 
     243void Backend::saveLoginInfo(QString user, QString desktop){ 
     244  writeSystemLastLogin(user,desktop); //save the system file (/usr/local/share/PCDM/.lastlogin) 
     245  writeUserLastDesktop(user,desktop); //save the user file (~/.lastlogin) 
    239246} 
    240247 
     
    360367   
    361368} 
     369 
     370void Backend::readSystemLastLogin(){ 
     371    if(!QFile::exists("/usr/local/share/PCDM/.lastlogin")){ 
     372      lastUser.clear(); 
     373      Backend::log("PCDM: No previous login data found"); 
     374    }else{ 
     375      //Load the previous login data 
     376      QFile file("/usr/local/share/PCDM/.lastlogin"); 
     377      if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ 
     378        Backend::log("PCDM: Unable to open previous login data file");     
     379      }else{ 
     380        QTextStream in(&file); 
     381        lastUser= in.readLine(); 
     382        lastDE= in.readLine(); 
     383        file.close(); 
     384      } 
     385    }   
     386} 
     387 
     388void Backend::writeSystemLastLogin(QString user, QString desktop){ 
     389  QFile file1("/usr/local/share/PCDM/.lastlogin"); 
     390  if(!file1.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)){ 
     391    Backend::log("PCDM: Unable to save last login data to system directory");      
     392  }else{ 
     393    QTextStream out(&file1); 
     394    out << user << "\n" << desktop; 
     395    file1.close(); 
     396  } 
     397 
     398} 
     399 
     400QString Backend::readUserLastDesktop(QString user){ 
     401  QString desktop; 
     402  QString LLpath = Backend::getUserHomeDir(user) + "/.lastlogin"; 
     403  if(!QFile::exists(LLpath)){ 
     404    Backend::log("PCDM: No previous user login data found for user: "+user); 
     405  }else{ 
     406    //Load the previous login data 
     407    QFile file(LLpath); 
     408    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ 
     409      Backend::log("PCDM: Unable to open previous user login file: "+user);     
     410    }else{ 
     411      QTextStream in(&file); 
     412      desktop = in.readLine(); 
     413      file.close(); 
     414    } 
     415  } 
     416  return desktop; 
     417} 
     418 
     419void Backend::writeUserLastDesktop(QString user, QString desktop){ 
     420  QFile file2( Backend::getUserHomeDir(user) + "/.lastlogin" ); 
     421  if(!file2.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)){ 
     422    Backend::log("PCDM: Unable to save last login data for user:"+user);           
     423  }else{ 
     424    QTextStream out(&file2); 
     425    out << desktop; 
     426    file2.close(); 
     427  } 
     428} 
  • src-qt4/PCDM/src/pcdm-backend.h

    r1620346 r90dc161  
    1313#include <QDir> 
    1414#include <QProcess> 
     15#include <QFile> 
    1516 
    1617#include "pcdm-config.h" 
     
    3536    static QStringList getSystemUsers(); 
    3637    static QString getUsernameFromDisplayname(QString); 
     38    static QString getDisplayNameFromUsername(QString); 
    3739    static QStringList keyModels(); 
    3840    static QStringList keyLayouts(); 
     
    4951    static QString getALPassword(); 
    5052     
     53    static QString getLastUser(); 
     54    static QString getLastDE(QString); 
     55    static void saveLoginInfo(QString, QString); 
     56     
    5157private:         
    5258    static void loadXSessionsData(); 
    5359    static QStringList readXSessionsFile(QString, QString); 
    5460    static void readSystemUsers(); 
    55   
     61    static void readSystemLastLogin(); 
     62    static void writeSystemLastLogin(QString, QString); 
     63    static QString readUserLastDesktop(QString); 
     64    static void writeUserLastDesktop(QString, QString); 
    5665     
    5766}; 
  • src-qt4/PCDM/src/pcdm-gui.cpp

    r1d2d46a r90dc161  
    2020PCDMgui::PCDMgui() : QMainWindow() 
    2121{ 
    22     lastUser.clear(); 
    23     lastDE.clear(); 
    2422    //Load the Theme 
    2523    loadTheme(); 
     
    5250    } 
    5351  } 
    54   //Load the data from the last successful login 
    55   loadLastUser(); 
    5652   
    5753} 
     
    178174    loginW = new LoginWidget; 
    179175    loginW->setUsernames(Backend::getSystemUsers()); //add in the detected users 
     176    QString lastUser = Backend::getLastUser(); 
    180177    if(!lastUser.isEmpty()){ //set the previously used user 
    181178        loginW->setCurrentUser(lastUser);  
    182         loadLastDE(lastUser); //make sure the DE switcher reflects the last user choice 
    183179    }  
    184180    //Set Icons from theme 
     
    248244  if(DEBUG_MODE){ qDebug() << " - Fill GUI with data"; } 
    249245  retranslateUi(); 
    250   if(simpleDESwitcher && !lastUser.isEmpty()){ 
    251      
    252   } 
    253246  if(DEBUG_MODE){ qDebug() << "Done with initialization"; } 
    254247 
     
    258251  //Get user inputs 
    259252  QString username = Backend::getUsernameFromDisplayname(displayname); 
    260   QString binary; 
     253  QString desktop; 
    261254  if(simpleDESwitcher){ 
    262     binary = Backend::getDesktopBinary(loginW->currentDE()); 
     255    desktop = loginW->currentDE(); 
    263256  }else{ 
    264     binary = Backend::getDesktopBinary(deSwitcher->currentItem()); 
     257    desktop = deSwitcher->currentItem(); 
    265258  } 
    266259  QString homedir = Backend::getUserHomeDir(username); 
     
    270263  toolbar->setEnabled(FALSE); 
    271264  //Try to login 
    272   emit xLoginAttempt(username, password, homedir, binary); 
     265  emit xLoginAttempt(username, password, homedir, desktop); 
    273266  //Return signals are connected to the slotLogin[Success/Failure] functions 
    274267   
     
    276269 
    277270void PCDMgui::slotLoginSuccess(){ 
    278   QString de; 
     271  /*QString de; 
    279272  if(simpleDESwitcher){ de = loginW->currentDE(); } 
    280273  else{ de = deSwitcher->currentItem(); } 
    281   saveLastLogin( loginW->currentUsername(), de ); 
     274  saveLastLogin( loginW->currentUsername(), de );*/ 
    282275  slotClosePCDM(); //now start to close down the PCDM GUI 
    283276} 
     
    316309  }else{ 
    317310    if(!simpleDESwitcher){ deSwitcher->setVisible(TRUE); } 
    318     //Try to load the user's last DE 
    319     loadLastDE(newuser); 
    320311    //Try to load the custom user icon 
    321312    slotUserChanged(newuser); 
     
    472463    //Get the new desktop list (translated) 
    473464    QStringList deList = Backend::getAvailableDesktops(); 
     465    QString lastDE = Backend::getLastDE(loginW->currentUsername()); 
    474466    //Now fill the switcher 
    475467    if(!simpleDESwitcher){ 
     
    497489      loginW->setDesktops(deList, deIcons, deInfo); 
    498490      //Set the switcher to the last used desktop environment 
    499       if( !lastDE.isEmpty() ){ loginW->setCurrentDE(lastDE); } 
    500     } 
    501  
    502 } 
    503  
    504 void PCDMgui::loadLastUser(){ 
    505   lastUser.clear(); 
    506   if(!QFile::exists("/usr/local/share/PCDM/.lastlogin")){ 
    507     Backend::log("PCDM: No previous login data found"); 
    508   }else{ 
    509     //Load the previous login data 
    510     QFile file("/usr/local/share/PCDM/.lastlogin"); 
    511     if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ 
    512       Backend::log("PCDM: Unable to open previous login data file");     
    513     }else{ 
    514       QTextStream in(&file); 
    515       lastUser= in.readLine(); 
    516       file.close(); 
    517     } 
    518   } 
    519 } 
    520  
    521 void PCDMgui::loadLastDE(QString user){ 
    522   lastDE.clear(); 
    523   QString LLpath = Backend::getUserHomeDir(user) + "/.lastlogin"; 
    524   if(!QFile::exists(LLpath)){ 
    525     Backend::log("PCDM: No previous user login data found for user: "+user); 
    526   }else{ 
    527     //Load the previous login data 
    528     QFile file(LLpath); 
    529     if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ 
    530       Backend::log("PCDM: Unable to open previous user login file: "+user);     
    531     }else{ 
    532       QTextStream in(&file); 
    533       lastDE= in.readLine(); 
    534       file.close(); 
    535     } 
    536   } 
    537  
    538 } 
    539  
    540 void PCDMgui::saveLastLogin(QString USER, QString DE){ 
    541   QFile file1("/usr/local/share/PCDM/.lastlogin"); 
    542   if(!file1.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)){ 
    543     Backend::log("PCDM: Unable to save last login data");          
    544   }else{ 
    545     QTextStream out(&file1); 
    546     out << USER; 
    547     file1.close(); 
    548   } 
    549   QFile file2( Backend::getUserHomeDir(USER) + "/.lastlogin" ); 
    550   if(!file2.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)){ 
    551     Backend::log("PCDM: Unable to save last login data for user:"+USER);           
    552   }else{ 
    553     QTextStream out(&file2); 
    554     out << DE; 
    555     file2.close(); 
    556   } 
    557 } 
    558  
     491      loginW->setCurrentDE(lastDE); 
     492    } 
     493 
     494} 
     495 
  • src-qt4/PCDM/src/pcdm-gui.h

    r1d2d46a r90dc161  
    7373 
    7474    QTranslator* m_translator; 
    75     QString translationDir, lastUser, lastDE; 
     75    QString translationDir; 
    7676     
    7777    QString hostname; 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r1add85d r90dc161  
    3030} 
    3131 
    32 void XProcess::loginToXSession(QString username, QString password, QString homedir, QString cmd){ 
     32void XProcess::loginToXSession(QString username, QString password, QString homedir, QString desktop){ 
    3333  //Setup the variables 
    3434  xuser = username; 
    3535  xpwd = password; 
    3636  xhome = homedir; 
    37   xcmd = cmd; 
     37  xcmd = Backend::getDesktopBinary(desktop); 
     38  xde = desktop; 
    3839  //Now start the login process 
    3940  startXSession(); 
     
    5960bool XProcess::startXSession(){ 
    6061  //Check that the necessary info to start the session is available 
    61   if( xuser.isEmpty() || xcmd.isEmpty() || xhome.isEmpty() ){ 
     62  if( xuser.isEmpty() || xcmd.isEmpty() || xhome.isEmpty() || xde.isEmpty() ){ 
    6263    emit InvalidLogin();  //Make sure the GUI knows that it was a failure 
    6364    return FALSE; 
     
    7071  if( !pam_startSession() ){ pam_shutdown(); return FALSE; } 
    7172  pam_session_open = TRUE; //flag that pam has an open session 
     73   
     74  //Save the current user/desktop as the last login 
     75  Backend::saveLoginInfo(Backend::getDisplayNameFromUsername(xuser),xde); 
    7276   
    7377  // Configure the DE startup command 
     
    100104  environ.insert("MAIL","/var/mail/"+xuser); //Set the mail variable 
    101105  environ.insert("GROUP",xuser); //Set the proper group id 
    102   environ.insert("SHLVL","1"); //Set the proper shell level 
     106  environ.insert("SHLVL","0"); //Set the proper shell level 
    103107  this->setProcessEnvironment(environ); 
    104108  this->setWorkingDirectory(xhome); //set the current directory to the user's home directory 
  • src-qt4/PCDM/src/pcdm-xprocess.h

    r1620346 r90dc161  
    3434   
    3535  public slots: 
    36         void loginToXSession(QString, QString, QString, QString); //user, pwd, homedir, cmd 
     36        void loginToXSession(QString, QString, QString, QString); //user, pwd, homedir, desktop 
    3737         
    3838  private: 
    39         QString xuser, xcmd, xhome, xpwd; 
     39        QString xuser, xcmd, xhome, xpwd, xde; 
    4040        bool startXSession(); 
    4141         
Note: See TracChangeset for help on using the changeset viewer.