Skip to content

Commit

Permalink
Remove hardcoded references to /home/nemo
Browse files Browse the repository at this point in the history 
Moves the definition of the home folder into the settings file and
defaults to /home/default.
  • Loading branch information
@llewelld
llewelld committed May 31, 2021
1 parent dee5ea9 commit 7369833
Show file tree
Hide file tree
Showing 50 changed files with 440 additions and 945 deletions.
4 changes: 2 additions & 2 deletions qml/filecase.qml
View file
Expand Up @@ -14,7 +14,7 @@ ApplicationWindow
property int pagesOrientations: savedorientation==="auto"? (Orientation.Portrait | Orientation.Landscape) :
(savedorientation==="landscape"? Orientation.Landscape : Orientation.Portrait)

initialPage: MainPage { id: mainPage; startFolder: "/"; nextFolder: config.readConfig("StartupFolder", "/home/nemo") }
initialPage: MainPage { id: mainPage; startFolder: "/"; nextFolder: config.readConfig("StartupFolder", config.getHome()) }
cover: coverPage

property bool loadingFolder: false
Expand All @@ -28,7 +28,7 @@ ApplicationWindow


CoverPage { id: coverPage }
//MainPage { id: mainPage; startFolder: "/"; nextFolder: config.readConfig("StartupFolder", "/home/nemo") }
//MainPage { id: mainPage; startFolder: "/"; nextFolder: config.readConfig("StartupFolder", config.getHome()) }
Config { id: config }
//Browser { id: browser }
Utilities { id: utilities }
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/Box.qml
View file
Expand Up @@ -215,7 +215,7 @@ Page {
title: model.name
description: model.modified + " - " + model.size
//size: model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
mime: "image/png"
//link: model.link
//type: model.type
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/BoxSettings.qml
View file
Expand Up @@ -15,7 +15,7 @@ Page {

onStatusChanged: {
if (status === PageStatus.Activating) {
downloadValue.value = getName(config.readConfig("Box/download_folder", "/home/nemo/Downloads"))
downloadValue.value = getName(config.readConfig("Box/download_folder", config.getHome() + "/Downloads"))
uploadValue.value = getName(config.readConfig("Box/upload_folder","/||0"))
}
}
Expand Down Expand Up @@ -157,7 +157,7 @@ Page {
ValueButton {
id: downloadValue
label: qsTr("Download folder")
value: getName(config.readConfig("OneDrive/download_folder", "/home/nemo/Downloads"))
value: getName(config.readConfig("OneDrive/download_folder", config.getHome() + "/Downloads"))
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/BoxUploadFolder.qml
View file
Expand Up @@ -85,7 +85,7 @@ Dialog {

title: model.name
description: model.modified + " - " + model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
mime: "image/png"

onClicked: {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/Drive.qml
View file
Expand Up @@ -215,7 +215,7 @@ Page {
title: model.name
description: model.modified + " - " + model.size
//size: model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
mime: "image/png"
//link: model.link
//type: model.type
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/DriveSettings.qml
View file
Expand Up @@ -15,7 +15,7 @@ Page {

onStatusChanged: {
if (status === PageStatus.Activating) {
downloadValue.value = getName(config.readConfig("Google Drive/download_folder", "/home/nemo/Downloads"))
downloadValue.value = getName(config.readConfig("Google Drive/download_folder", config.getHome() "/Downloads"))
uploadValue.value = getName(config.readConfig("Google Drive/upload_folder","/||root"))
}
}
Expand Down Expand Up @@ -155,7 +155,7 @@ Page {
ValueButton {
id: downloadValue
label: qsTr("Download folder")
value: getName(config.readConfig("Google Drive/download_folder", "/home/nemo/Downloads"))
value: getName(config.readConfig("Google Drive/download_folder", config.getHome() + "/Downloads"))
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/DriveUploadFolder.qml
View file
Expand Up @@ -85,7 +85,7 @@ Dialog {

title: model.name
description: model.modified + " - " + model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
mime: "image/png"

onClicked: {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/Dropbox.qml
View file
Expand Up @@ -218,7 +218,7 @@ Page {
title: model.name
description: model.date + " - " + model.size
//size: model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
mime: "image/png"
//link: model.link
//type: model.type
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/DropboxSettings.qml
View file
Expand Up @@ -15,7 +15,7 @@ Page {

onStatusChanged: {
if (status === PageStatus.Activating) {
downloadValue.value = getName(config.readConfig("Dropbox/download_folder", "/home/nemo/Downloads"))
downloadValue.value = getName(config.readConfig("Dropbox/download_folder", config.getHome() + "/Downloads"))
uploadValue.value = getName(config.readConfig("Dropbox/upload_folder","/||root"))
}
}
Expand Down Expand Up @@ -156,7 +156,7 @@ Page {
ValueButton {
id: downloadValue
label: qsTr("Download folder")
value: getName(config.readConfig("Dropbox/download_folder", "/home/nemo/Downloads"))
value: getName(config.readConfig("Dropbox/download_folder", config.getHome() + "/Downloads"))
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/DropboxUploadFolder.qml
View file
Expand Up @@ -84,7 +84,7 @@ Dialog {

title: model.name
description: model.modified + " - " + model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
mime: "image/png"

onClicked: {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/ExtractDialog.qml
View file
Expand Up @@ -18,7 +18,7 @@ Dialog {

onStatusChanged: {
if (status===PageStatus.Activating)
startupFolder.value = getName(config.readConfig("ExtractFolder", "/home/nemo"))
startupFolder.value = getName(config.readConfig("ExtractFolder", config.getHome()))
}


Expand Down
12 changes: 6 additions & 6 deletions qml/pages/FoldersPanel.qml
View file
Expand Up @@ -24,16 +24,16 @@ Page {


property var deviceModel: [
{ name: qsTr("Phone memory"), folder: "/home/nemo", icon: "image://theme/icon-m-phone" } ,
{ name: qsTr("Phone memory"), folder: config.getHome(), icon: "image://theme/icon-m-phone" } ,
{ name: qsTr("SD Card"), folder: sdfolder, icon: "file:///usr/share/filecase/icons/toolbar-sdcard.png" }
]

property var placesModel: [
{ name: qsTr("Documents"), folder: "/home/nemo/Documents", icon: "image://theme/icon-m-document" },
{ name: qsTr("Downloads"), folder: "/home/nemo/Downloads", icon: "image://theme/icon-m-cloud-download" },
{ name: qsTr("Music"), folder: "/home/nemo/Music", icon: "image://theme/icon-m-sounds" },
{ name: qsTr("Videos"), folder: "/home/nemo/Videos", icon: "image://theme/icon-m-media" },
{ name: qsTr("Pictures"), folder: "/home/nemo/Pictures", icon: "image://theme/icon-m-image" }
{ name: qsTr("Documents"), folder: config.getHome() + "/Documents", icon: "image://theme/icon-m-document" },
{ name: qsTr("Downloads"), folder: config.getHome() + "/Downloads", icon: "image://theme/icon-m-cloud-download" },
{ name: qsTr("Music"), folder: config.getHome() + "/Music", icon: "image://theme/icon-m-sounds" },
{ name: qsTr("Videos"), folder: config.getHome() + "/Videos", icon: "image://theme/icon-m-media" },
{ name: qsTr("Pictures"), folder: config.getHome() + "/Pictures", icon: "image://theme/icon-m-image" }
]


Expand Down
8 changes: 4 additions & 4 deletions qml/pages/MainPage.qml
View file
Expand Up @@ -48,8 +48,8 @@ Page {

if (!showRootFiles) {
console.log("Root files hidden. index = " + nextFolder.indexOf(sdfolder))
if (nextFolder.indexOf(sdfolder)===-1 && nextFolder.indexOf("/home/nemo")===-1)
nextFolder = "/home/nemo"
if (nextFolder.indexOf(sdfolder)===-1 && nextFolder.indexOf(config.getHome())===-1)
nextFolder = config.getHome()
}

//console.log("Destination Folder = "+nextFolder)
Expand Down Expand Up @@ -88,7 +88,7 @@ Page {
}

function checkRoot() {
if ((!showRootFiles && (browser.path=="/home/nemo" || browser.path==sdfolder)) || browser.path=="/")
if ((!showRootFiles && (browser.path==config.getHome() || browser.path==sdfolder)) || browser.path=="/")
backNavigation = false
else
backNavigation = true
Expand Down Expand Up @@ -239,7 +239,7 @@ Page {

/*IconButton {
id: upBtn
//enabled: browser.path!=="/" || (showRootFiles && browser.path=="/home/nemo")
//enabled: browser.path!=="/" || (showRootFiles && browser.path==config.getHome())
anchors.verticalCenter: header.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Theme.paddingMedium
Expand Down
18 changes: 9 additions & 9 deletions qml/pages/SelDownloadFolder.qml
View file
Expand Up @@ -25,18 +25,18 @@ Dialog {
console.log("CURRENT LOCATION: " + currentLocation)

if (currentLocation=="device")
browser.setPath( config.readConfig("StartupFolder", "/home/nemo") )
browser.setPath( config.readConfig("StartupFolder", config.getHome()) )
else if (currentLocation=="extract")
browser.setPath( config.readConfig("ExtractFolder", "/home/nemo") )
browser.setPath( config.readConfig("ExtractFolder", config.getHome()) )
else
browser.setPath( config.readConfig(currentLocation + "/download_folder", "/home/nemo/Downloads") )
browser.setPath( config.readConfig(currentLocation + "/download_folder", config.getHome() + "/Downloads") )
}
}

canAccept: !loadingFolder

function checkRoot() {
if (browser.path==="/home/nemo" || browser.path===sdfolder)
if (browser.path===config.getHome() || browser.path===sdfolder)
upBtn.enabled = false
else
upBtn.enabled = true
Expand Down Expand Up @@ -69,12 +69,12 @@ Dialog {
PullDownMenu {
visible: sdfolder!==""
MenuItem {
text: browser.path.indexOf("/home/nemo")>-1? qsTr("SD Card") : qsTr("Phone memory")
text: browser.path.indexOf(config.getHome())>-1? qsTr("SD Card") : qsTr("Phone memory")
onClicked: {
if (browser.path.indexOf("/home/nemo")>-1)
if (browser.path.indexOf(config.getHome())>-1)
browser.setPath(sdfolder)
else
browser.setPath("/home/nemo")
browser.setPath(config.getHome())
}
}
}
Expand All @@ -92,15 +92,15 @@ Dialog {

IconButton {
id: upBtn
enabled: browser.path.indexOf("/home/nemo/")>-1
enabled: browser.path.indexOf(config.getHome() + "/")>-1
anchors.verticalCenter: header2.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Theme.paddingMedium
icon.source: "image://theme/icon-m-up"
onClicked: {
console.log("Current path: " + browser.path)

if (browser.path==="/home/nemo" || browser.path===sdfolder) {
if (browser.path===config.getHome() || browser.path===sdfolder) {
return
}
else
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/Settings.qml
View file
Expand Up @@ -14,7 +14,7 @@ Page {
if (status === PageStatus.Activating) {
loaded = false
orientationMenu.currentIndex = savedorientation==="auto"? 0 : (savedorientation==="portrait"? 1 : 2)
startupFolder.value = getName(config.readConfig("StartupFolder","/home/nemo"))
startupFolder.value = getName(config.readConfig("StartupFolder",config.getHome()))
hiddenFilesMenu.checked = config.readConfig("ShowHiddenFiles", "false")==="true"
thumbnailsMenu.checked = config.readConfig("ShowThumbnails", "false")==="true"
dateFormatMenu.currentIndex = config.readConfig("DateFormat","dd/mm/yyyy")==="dd/mm/yyyy"? 0 : 1
Expand Down Expand Up @@ -139,7 +139,7 @@ Page {
ValueButton {
id: startupFolder
label: qsTr("Startup folder")
value: config.readConfig("StartupFolder", "/home/nemo")
value: config.readConfig("StartupFolder", config.getHome())
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/SkyDrive.qml
View file
Expand Up @@ -215,7 +215,7 @@ Page {
title: model.name
description: model.modified + " - " + model.size
//size: model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
mime: "image/png"
//link: model.link
//type: model.type
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/SkySettings.qml
View file
Expand Up @@ -15,7 +15,7 @@ Page {

onStatusChanged: {
if (status === PageStatus.Activating) {
downloadValue.value = getName(config.readConfig("OneDrive/download_folder", "/home/nemo/Downloads"))
downloadValue.value = getName(config.readConfig("OneDrive/download_folder", config.getHome() + "/Downloads"))
uploadValue.value = getName(config.readConfig("OneDrive/upload_folder","/||/"))
}
}
Expand Down Expand Up @@ -157,7 +157,7 @@ Page {
ValueButton {
id: downloadValue
label: qsTr("Download folder")
value: getName(config.readConfig("OneDrive/download_folder", "/home/nemo/Downloads"))
value: getName(config.readConfig("OneDrive/download_folder", config.getHome() + "/Downloads"))
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/SkyUploadFolder.qml
View file
Expand Up @@ -85,7 +85,7 @@ Dialog {

title: model.name
description: model.modified + " - " + model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
mime: "image/png"

onClicked: {
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/WebDavPage.qml
View file
Expand Up @@ -184,7 +184,7 @@ Page {
title: model.name
description: model.modified + " - " + model.size
//size: model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/" + iconTheme + "/" + model.exten + ".png" : model.exten
mime: "image/png"
//link: model.link
//type: model.type
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/WebDavSettings.qml
View file
Expand Up @@ -15,7 +15,7 @@ Page {

onStatusChanged: {
if (status === PageStatus.Activating) {
downloadValue.value = getName(config.readConfig(currentLocation+"/download_folder", "/home/nemo/Downloads"))
downloadValue.value = getName(config.readConfig(currentLocation+"/download_folder", config.getHome() + "/Downloads"))
uploadValue.value = getName(config.readConfig(currentLocation+"/upload_folder","/"))
}
}
Expand Down Expand Up @@ -158,7 +158,7 @@ Page {
ValueButton {
id: downloadValue
label: qsTr("Download folder")
value: getName(config.readConfig(currentLocation+"/download_folder", "/home/nemo/Downloads"))
value: getName(config.readConfig(currentLocation+"/download_folder", config.getHome() + "/Downloads"))
onClicked: {
pageStack.push("SelDownloadFolder.qml")
}
Expand Down
2 changes: 1 addition & 1 deletion qml/pages/WebDavUploadFolder.qml
View file
Expand Up @@ -87,7 +87,7 @@ Dialog {

title: model.name
description: model.modified + " - " + model.size
imgsource: model.exten.indexOf("/home/nemo")===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
imgsource: model.exten.indexOf(config.getHome())===-1? "/usr/share/filecase/icons/" + model.exten + ".png" : model.exten
mime: "image/png"

onClicked: {
Expand Down
7 changes: 4 additions & 3 deletions src/boxclient.cpp
View file
Expand Up @@ -2,6 +2,7 @@

#include "sys/vfs.h"
#include "utils.h"
#include "config.h"

#include <QDesktopServices>
#include <QDir>
Expand Down Expand Up @@ -120,9 +121,9 @@ void BoxClient::BoxClientPrivate::populateItems()
{
item->exten = GetExtension( item->name.toLower() );

if ( ! QFileInfo("/home/nemo/.thumbnails/filecase").exists() ) {
if ( ! QFileInfo(Config::getHome() + "/.thumbnails/filecase").exists() ) {
QDir dir;
dir.mkdir("/home/nemo/.thumbnails/filecase");
dir.mkdir(Config::getHome() + "/.thumbnails/filecase");
}

if (settings.value("ShowThumbnails","false")=="true")
Expand All @@ -136,7 +137,7 @@ void BoxClient::BoxClientPrivate::populateItems()
QString file = "Box/" + item->fid;
file.replace("//","/");
md.addData(file.toUtf8());
QString tf = "/home/nemo/.thumbnails/filecase/"+ QString(md.result().toHex().constData()) + ".png";
QString tf = Config::getHome() + "/.thumbnails/filecase/"+ QString(md.result().toHex().constData()) + ".png";
if ( QFileInfo(tf).exists() ) {
item->exten = tf;
} else {
Expand Down
7 changes: 4 additions & 3 deletions src/browser.cpp
View file
Expand Up @@ -4,6 +4,7 @@
#include "qtfilecopier.h"
#include "filedeleter.h"
#include "utils.h"
#include "config.h"

//#include <gconf/2/gconf/gconf.h>
//#include <gconf/2/gconf/gconf-client.h>
Expand Down Expand Up @@ -467,8 +468,8 @@ void Browser::goUp()
void Browser::showRootFiles(bool show)
{
showRootFileSystem = show;
if ( !d->path.contains("/home/nemo") && show==false )
setPath("/home/nemo");
if ( !d->path.contains(Config::getHome()) && show==false )
setPath(Config::getHome());
}

void Browser::showHidden(bool show)
Expand Down Expand Up @@ -782,7 +783,7 @@ void Browser::cleanCache()
{
d->cleaningCache = 1;
qDebug() << "CLEANING THUMBNAILS CACHE";
removeFile("/home/nemo/.thumbnails/filecase");
removeFile(Config::getHome() + "/.thumbnails/filecase");
d->cleaningCache = 0;
//d->iface->call("Cleanup");
}
Expand Down

0 comments on commit 7369833

Please sign in to comment.