Commit 74c75c2f authored by camilo higuita's avatar camilo higuita

support new mauikit sidebar and android fixes

parent 98518135
......@@ -10,9 +10,12 @@ namespace INX
Q_NAMESPACE
const QString NotifyDir = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
const QString app = "Index";
const QString version = "1.0.0";
const QString description = "File manager";
const QString appName = QStringLiteral("Index");
const QString displayName = QStringLiteral("Index");
const QString version = QStringLiteral("1.0.0");
const QString description = QStringLiteral("File manager");
const QString orgName = QStringLiteral("Maui");
const QString orgDomain = QStringLiteral("org.maui.index");
}
#endif // INX_H
......@@ -62,10 +62,11 @@ int main(int argc, char *argv[])
return -1;
#endif
app.setApplicationName(INX::app);
app.setApplicationName(INX::appName);
app.setApplicationVersion(INX::version);
app.setApplicationDisplayName(INX::app);
app.setOrganizationName("org.maui.index");
app.setApplicationDisplayName(INX::displayName);
app.setOrganizationName(INX::orgName);
app.setOrganizationDomain(INX::orgDomain);
app.setWindowIcon(QIcon(":/index.png"));
QCommandLineParser parser;
......
......@@ -90,48 +90,42 @@ Maui.ApplicationWindow
id: dialogLoader
}
globalDrawer: Maui.GlobalDrawer
sideBar: Maui.PlacesSidebar
{
id: _drawer
width: placesSidebar.collapsed ? placesSidebar.iconSize * 2.5 : Math.min(Kirigami.Units.gridUnit * 11, root.width)
height: root.height - root.header.height - browser.footer.height
modal: false
handleVisible: false
contentItem: Maui.PlacesSidebar
id: placesSidebar
collapsed : !root.isWide
collapsible: true
section.property: !showLabels ? "" : "type"
preferredWidth: Math.min(Kirigami.Units.gridUnit * 11, root.width)
height: root.height - root.header.height
iconSize: Maui.Style.iconSizes.medium
onPlaceClicked:
{
id: placesSidebar
collapsed : !root.isWide
section.property: collapsed ? "" : "type"
onPlaceClicked:
{
if(_drawer.modal)
_drawer.close()
browser.openFolder(path)
browser.openFolder(path)
if(searchBar)
searchBar = false
}
if(searchBar)
searchBar = false
if(placesSidebar.modal)
placesSidebar.collapse()
}
list.groups: [
Maui.FMList.PLACES_PATH,
Maui.FMList.APPS_PATH,
Maui.FMList.CLOUD_PATH,
Maui.FMList.REMOTE_PATH,
Maui.FMList.REMOVABLE_PATH,
Maui.FMList.DRIVES_PATH,
Maui.FMList.TAGS_PATH]
list.groups: [
Maui.FMList.PLACES_PATH,
Maui.FMList.APPS_PATH,
Maui.FMList.CLOUD_PATH,
Maui.FMList.REMOTE_PATH,
Maui.FMList.REMOVABLE_PATH,
Maui.FMList.DRIVES_PATH,
Maui.FMList.TAGS_PATH]
itemMenu.contentData: [MenuItem
itemMenu.contentData: [MenuItem
{
text: qsTr("Open in tab")
onTriggered: browser.openTab(placesSidebar.list.get(placesSidebar.currentIndex).path)
}]
}
}
ColumnLayout
{
anchors.fill: parent
......@@ -164,7 +158,7 @@ Maui.ApplicationWindow
{
console.log("trying to open paths:", paths)
for(var index in paths)
browser.openTab(paths[index])
browser.openTab(paths[index])
}
}
......
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