anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Windows compatibility Tweaks

Browse source
This commit is contained in:
LAGonauta 2020-05-02 12:47:40 -03:00
parent ce292d03e3
commit eb7cf3297c
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdino/src/service/file_manager.vala
View file

@ -63,7 +63,7 @@ public class FileManager : StreamInteractionModule, Object {
try { try {
FileInfo file_info = file.query_info("*", FileQueryInfoFlags.NONE); FileInfo file_info = file.query_info("*", FileQueryInfoFlags.NONE);
file_transfer.file_name = file_info.get_display_name(); file_transfer.file_name = file_info.get_display_name();
file_transfer.mime_type = file_info.get_content_type(); file_transfer.mime_type = Util.get_content_type(file_info);
file_transfer.size = (int)file_info.get_size(); file_transfer.size = (int)file_info.get_size();
file_transfer.input_stream = yield file.read_async(); file_transfer.input_stream = yield file.read_async();
@ -245,7 +245,7 @@ public class FileManager : StreamInteractionModule, Object {
file_transfer.input_stream = yield file.read_async(); file_transfer.input_stream = yield file.read_async();
FileInfo file_info = file_transfer.get_file().query_info("*", FileQueryInfoFlags.NONE); FileInfo file_info = file_transfer.get_file().query_info("*", FileQueryInfoFlags.NONE);
file_transfer.mime_type = file_info.get_content_type(); file_transfer.mime_type = Util.get_content_type(file_info);
file_transfer.state = FileTransfer.State.COMPLETE; file_transfer.state = FileTransfer.State.COMPLETE;
} catch (Error e) { } catch (Error e) {

21
libdino/src/service/util.vala
View file

@ -26,6 +26,25 @@ public class Util {
} }
assert_not_reached(); assert_not_reached();
} }
}
public static string get_content_type(FileInfo fileInfo)
{
//#if WIN32
string fileName = fileInfo.get_name();
int fileNameLength = fileName.length;
int extIndex = fileName.index_of(".");
if (extIndex < fileNameLength)
{
string extension = fileName.substring(extIndex, fileNameLength - extIndex);
string mime_type = ContentType.get_mime_type(extension);
if (mime_type != null && mime_type.length != 0)
{
return mime_type;
}
}
//#endif
return fileInfo.get_content_type();
}
}
} }

4
main/src/ui/main_window.vala
View file

@ -54,6 +54,10 @@ public class MainWindow : Gtk.Window {
} }
private void setup_unified() { private void setup_unified() {
new Dino.Ui.ConversationSelector();
new Dino.Ui.ConversationSummary.ConversationView();
new Dino.Ui.ChatInput.View();
new Dino.Ui.GlobalSearch();
Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui"); Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
paned = (Paned) builder.get_object("paned"); paned = (Paned) builder.get_object("paned");
box.add(paned); box.add(paned);